diff options
| author | Al Viro <viro@ftp.linux.org.uk> | 2008-02-05 01:27:29 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-05 12:44:08 -0500 |
| commit | 7492d4a416d68ab4bd254b36ffcc4e0138daa8ff (patch) | |
| tree | f6d2f168c668771b04a984ac1cc426d146b8559b /include/linux | |
| parent | f79c343e2e5ba82b9661e7287a42fac596bf367a (diff) | |
sdio: fix module device table definition for m68k
FATAL: drivers/bluetooth/btsdio: sizeof(struct sdio_device_id)=12 is not a modulo of the size of section __mod_sdio_device_table=30.
Fix definition of struct sdio_device_id in mod_devicetable.h
m68k has 16bit alignment for unsigned long.
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Sam Ravnborg <sam@ravnborg.org>
Cc: Pierre Ossman <drzeus@drzeus.cx>
CC: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/mod_devicetable.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/mod_devicetable.h b/include/linux/mod_devicetable.h index e9fddb42f26c..139d49d2f078 100644 --- a/include/linux/mod_devicetable.h +++ b/include/linux/mod_devicetable.h | |||
| @@ -343,7 +343,8 @@ struct sdio_device_id { | |||
| 343 | __u8 class; /* Standard interface or SDIO_ANY_ID */ | 343 | __u8 class; /* Standard interface or SDIO_ANY_ID */ |
| 344 | __u16 vendor; /* Vendor or SDIO_ANY_ID */ | 344 | __u16 vendor; /* Vendor or SDIO_ANY_ID */ |
| 345 | __u16 device; /* Device ID or SDIO_ANY_ID */ | 345 | __u16 device; /* Device ID or SDIO_ANY_ID */ |
| 346 | kernel_ulong_t driver_data; /* Data private to the driver */ | 346 | kernel_ulong_t driver_data /* Data private to the driver */ |
| 347 | __attribute__((aligned(sizeof(kernel_ulong_t)))); | ||
| 347 | }; | 348 | }; |
| 348 | 349 | ||
| 349 | /* SSB core, see drivers/ssb/ */ | 350 | /* SSB core, see drivers/ssb/ */ |