[iPAQ] More kernel build breakage :(

Hi folks,

Unfortunately there seems to be more problems:

At line 321 in h3600_ts.h:

[...]
typedef struct h3600_option_pack_request {
 unsigned byte cmdlen; /* cmd << 4 | len */
 unsigned char data[SPI_RD_BUFSIZ];
} OPTION_PACK_REQUEST;

`unsigned byte' should be `unsigned char'.

At line 37 in kernel/include/asm-arm/arch/backpaq.h:

[...]
   short pad5;
   volatile short pcmcia_power; /* 0x14 */
   short pad6;
   volatile short flash_control; /* 0x18 */
   short pad7;
   volatile short gencontrol; /* 0x1c */
   short pad7;
   long pad[4]; /* 0x20, 0x24, 0x28, 0x2c */
   long socket[2]; /* readable image at 0x30 and 0x34 */
};

there are two members named pad7!

Then after fixing this, the build blows up with:
[...]
h3600_backpaq.c: In function `backpaq_set_vpp':
h3600_backpaq.c:142: `BACKPAQ_REGC_FLASH_VPPEN' undeclared (first use in this
function)
h3600_backpaq.c:142: (Each undeclared identifier is reported only once
h3600_backpaq.c:142: for each function it appears in.)
make[2]: *** [h3600_backpaq.o] Error 1
make[2]: Leaving directory `/usr/src/linux/kernel/drivers/pcmcia'
make[1]: *** [_modsubdir_pcmcia] Error 2
make[1]: Leaving directory `/usr/src/linux/kernel/drivers'
make: *** [_mod_drivers] Error 2

Indeed BACKPAQ_REGC_FLASH_VPPEN was removed in a recent cvs commit. It was
not removed from the code in h3600_backpaq.c though. :(

It was originally defined as:

#define BACKPAQ_REGC_FLASH_VPPEN (1 << 10)

Is the new macro supposed to be (??):

#define BACKPAQ_FLASH_VPPEN (1 << 8)

I used the "new" version (from version 1.9 of
linux/kernel/include/asm-arm/arch-sa1100/backpaq.h) and the rest of the
kernel seems to build ok.

Ouch! It would seem that I stumbled upon the bleeding edge! ;)

--
Regards, Devin.