e1000 driver and 2.2.19 kernel , compilation problems

[Brecht Vermeulen]

Dear,

there were some problems with the compilation of the e1000 driver from
the current cvs source and a 2.2.19 kernel.

gcc -DLINUX -D__KERNEL__ -DMODULE -DEXPORT_SYMTAB -O2 -pipe -I.
-I/usr/src/linux/include    -DCLICK_POLLING   -c -o e1000_main.o
e1000_main.c
In file included from e1000.h:55,
                 from e1000_main.c:78:
/usr/src/linux/include/linux/init.h:117: warning: `module_init'
redefined
e1000_kcompat.h:159: warning: this is the location of the previous
definition
/usr/src/linux/include/linux/init.h:121: warning: `module_exit'
redefined
e1000_kcompat.h:160: warning: this is the location of the previous
definition
In file included from e1000.h:45,
                 from e1000_main.c:78:
e1000_kcompat.h:88: conflicting types for `dma_addr_t'
/usr/src/linux/include/asm/types.h:44: previous declaration of
`dma_addr_t'
make: *** [e1000_main.o] Error 1

This is solved by :
line 87 : #if   ( LINUX_VERSION_CODE < KERNEL_VERSION(2,2,18) )        
(instead of ! ( == )

line 158 : #if ( LINUX_VERSION_CODE < KERNEL_VERSION(2,2,18) ||
LINUX_VERSION_CODE > KERNEL(2,3,0) )

I don't know if this is correct (I don't know what has changed in every
kernel version) but it compiles :-).

best regards,
Brecht