The Linux Kernel Mailing List
 help / color / mirror / Atom feed
* [2.5 patch] tiglusb.c must include version.h
@ 2002-08-11 12:20 Adrian Bunk
  2002-08-12  0:12 ` Brad Hards
  0 siblings, 1 reply; 4+ messages in thread
From: Adrian Bunk @ 2002-08-11 12:20 UTC (permalink / raw)
  To: Julien BLACHE, greg; +Cc: linux-kernel


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



^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [2.5 patch] tiglusb.c must include version.h
  2002-08-11 12:20 [2.5 patch] tiglusb.c must include version.h Adrian Bunk
@ 2002-08-12  0:12 ` Brad Hards
  2002-08-12  8:28   ` Julien BLACHE
  0 siblings, 1 reply; 4+ messages in thread
From: Brad Hards @ 2002-08-12  0:12 UTC (permalink / raw)
  To: Adrian Bunk, Julien BLACHE, greg; +Cc: linux-kernel

-----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-----


^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [2.5 patch] tiglusb.c must include version.h
  2002-08-12  0:12 ` Brad Hards
@ 2002-08-12  8:28   ` Julien BLACHE
  2002-08-12 17:30     ` Greg KH
  0 siblings, 1 reply; 4+ messages in thread
From: Julien BLACHE @ 2002-08-12  8:28 UTC (permalink / raw)
  To: Brad Hards; +Cc: Adrian Bunk, greg, linux-kernel, rlievin

Brad Hards <bhards@bigpond.net.au> 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> 
<jb@jblache.org> 

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [2.5 patch] tiglusb.c must include version.h
  2002-08-12  8:28   ` Julien BLACHE
@ 2002-08-12 17:30     ` Greg KH
  0 siblings, 0 replies; 4+ messages in thread
From: Greg KH @ 2002-08-12 17:30 UTC (permalink / raw)
  To: Julien BLACHE; +Cc: Brad Hards, Adrian Bunk, linux-kernel, rlievin

On Mon, Aug 12, 2002 at 10:28:18AM +0200, Julien BLACHE wrote:
> Brad Hards <bhards@bigpond.net.au> 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

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2002-08-12 17:31 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2002-08-11 12:20 [2.5 patch] tiglusb.c must include version.h Adrian Bunk
2002-08-12  0:12 ` Brad Hards
2002-08-12  8:28   ` Julien BLACHE
2002-08-12 17:30     ` Greg KH

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox