[iPAQ] Kernel build breakage

Hi Folks,

I'm trying to build the kernel from cvs as of a few minutes ago and "make
modules" blows up with:

arm-linux-gcc -D__KERNEL__ -I/usr/src/linux-arm/kernel/include -Wall
-Wstrict-prototypes -O2
 -fno-strict-aliasing -fno-common -pipe -mapcs-32 -march=armv4
-mtune=strongarm1100 -mshort-load-bytes -msoft-float -DMODULE -c -o
h3600_ts.o h3600_ts.c
In file included from h3600_ts.c:40:
/usr/src/linux-arm/kernel/include/linux/h3600_ts.h:301: redefinition of
`struct h3600_spi_read_request'
/usr/src/linux-arm/kernel/include/linux/h3600_ts.h:322: warning: no semicolon
at end of struct or union
/usr/src/linux-arm/kernel/include/linux/h3600_ts.h:322: parse error before
`cmdlen'
/usr/src/linux-arm/kernel/include/linux/h3600_ts.h:324: parse error before `}'
/usr/src/linux-arm/kernel/include/linux/h3600_ts.h:324: warning: type
defaults to `int' in declaration of `OPTION_PACK_REQUEST'
/usr/src/linux-arm/kernel/include/linux/h3600_ts.h:324: warning: data
definition has no type
or storage class
make[2]: *** [h3600_ts.o] Error 1
make[2]: Leaving directory `/usr/src/linux-arm/kernel/drivers/char'
make[1]: *** [_modsubdir_char] Error 2
make[1]: Leaving directory `/usr/src/linux-arm/kernel/drivers'
make: *** [_mod_drivers] Error 2

I took a look at the code and the problem seems to be that struct
h3600_spi_read_request is defined twice:

/* SPI READ */

#define SPI_READ_CMD_OFFSET 0
#define SPI_READ_CMD_LEN 3
typedef struct h3600_spi_read_request {
 unsigned short addr; /* 16bit Address Offset 0-128 */
 unsigned char len; /* Number of bytes to read */
 unsigned char buff[SPI_RD_BUFSIZ];
} SPI_READ;

/* SPI WRITE */
#define SPI_WRITE_CMD_OFFSET 2
typedef struct h3600_spi_read_request {
 unsigned short len; /* used only to compute the number of bytes to send */
 unsigned short addr; /* this 16bit address accesses a single byte */
 unsigned char buff[SPI_WR_BUFSIZ];
} SPI_WRITE;

Shouldn't the second struct be h3600_spi_write_request ? :)

--
Regards, Devin.