2002-08-11 12:17:06

by Adrian Bunk

Subject: [2.5 patch] tiglusb.c must include version.h

Compile error in 2.5.31:

<-- snip -->

...
gcc -Wp,-MD,./.tiglusb.o.d -D__KERNEL__
-I/home/bunk/linux/kernel-2.5/linux-2.5.31-full/include -Wall
-Wstrict-prototypes -Wno-trigraphs -O2 -fomit-frame-pointer
-fno-strict-aliasing -fno-common -pipe -mpreferred-stack-boundary=2
-march=k6 -nostdinc -iwithprefix include -DKBUILD_BASENAME=tiglusb -c
-o tiglusb.o tiglusb.c
tiglusb.c:44: parse error
make[3]: *** [tiglusb.o] Error 1
make[3]: Leaving directory
`/home/bunk/linux/kernel-2.5/linux-2.5.31-full/drivers/usb/misc'

<-- snip -->

line 44 is:
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)


The fix is simple:

--- drivers/usb/misc/tiglusb.c~ 2002-08-11 03:41:17.000000000 +0200
+++ drivers/usb/misc/tiglusb.c 2002-08-11 14:17:13.000000000 +0200
@@ -37,6 +37,7 @@
#include <linux/usb.h>
#include <linux/smp_lock.h>
#include <linux/devfs_fs_kernel.h>
+#include <linux/version.h>

#include <linux/ticable.h>
#include "tiglusb.h"


cu
Adrian

--

You only think this is a free country. Like the US the UK spends a lot of
time explaining its a free country because its a police state.
Alan Cox

2002-08-12 00:17:23

by Brad Hards

Subject: Re: [2.5 patch] tiglusb.c must include version.h

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On Sun, 11 Aug 2002 22:20, Adrian Bunk wrote:
> Compile error in 2.5.31:
<snip>
> line 44 is:
> #if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
>
>
> The fix is simple:
<snip>
> +#include <linux/version.h>

Wouldn't it be cleaner to just remove this case? It is in 2.5, after all.

Brad

- --
http://conf.linux.org.au. 22-25Jan2003. Perth, Australia. Birds in Black.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.0.6 (GNU/Linux)
Comment: For info see http://www.gnupg.org

iD8DBQE9Vv2KW6pHgIdAuOMRAkDxAJ0fGa94qr39MYXul6npXVcyBYkhzACfU84t
rG1pdMxk4LnlsF0w5PzQCzU=
=cwOV
-----END PGP SIGNATURE-----

2002-08-12 08:24:35

by Julien BLACHE

Subject: Re: [2.5 patch] tiglusb.c must include version.h

Brad Hards <[email protected]> wrote:

Hi,

>> line 44 is:
>> #if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
>>
>>
>> The fix is simple:
> <snip>
>> +#include <linux/version.h>
>
> Wouldn't it be cleaner to just remove this case? It is in 2.5, after all.

We use this case so we don't have to maintain 2 /slightly/ different
versions of the source, as we're distributing this module outside of
the kernel tree for use with kernel 2.4.x.

Moreover I asked Greg to push this module into the 2.4 tree if
possible, so as long as there aren't major changes in the 2.5 code
I'd really like to keep the same source for 2.4 and 2.5.

But if this should become a hassle for anybody, I'll remove this case
ASAP.

JB.

--
Julien BLACHE <http://www.jblache.org>
<[email protected]>

2002-08-12 17:31:32

by Greg KH

Subject: Re: [2.5 patch] tiglusb.c must include version.h

On Mon, Aug 12, 2002 at 10:28:18AM +0200, Julien BLACHE wrote:
> Brad Hards <[email protected]> wrote:
>
> Hi,
>
> >> line 44 is:
> >> #if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
> >>
> >>
> >> The fix is simple:
> > <snip>
> >> +#include <linux/version.h>
> >
> > Wouldn't it be cleaner to just remove this case? It is in 2.5, after all.

I agree.

> But if this should become a hassle for anybody, I'll remove this case
> ASAP.

Don't worry about it, I just made the change in my tree, and will send
the change to Linus later today.

thanks,

greg k-h