Commit:     7492d4a416d68ab4bd254b36ffcc4e0138daa8ff
Parent:     f79c343e2e5ba82b9661e7287a42fac596bf367a
Author:     Al Viro <[EMAIL PROTECTED]>
AuthorDate: Mon Feb 4 22:27:29 2008 -0800
Committer:  Linus Torvalds <[EMAIL PROTECTED]>
CommitDate: Tue Feb 5 09:44:08 2008 -0800

    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 <[EMAIL PROTECTED]>
    Cc: Sam Ravnborg <[EMAIL PROTECTED]>
    Cc: Pierre Ossman <[EMAIL PROTECTED]>
    CC: Marcel Holtmann <[EMAIL PROTECTED]>
    Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
    Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
 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 e9fddb4..139d49d 100644
--- a/include/linux/mod_devicetable.h
+++ b/include/linux/mod_devicetable.h
@@ -343,7 +343,8 @@ struct sdio_device_id {
        __u8    class;                  /* Standard interface or SDIO_ANY_ID */
        __u16   vendor;                 /* Vendor or SDIO_ANY_ID */
        __u16   device;                 /* Device ID or SDIO_ANY_ID */
-       kernel_ulong_t driver_data;     /* Data private to the driver */
+       kernel_ulong_t driver_data      /* Data private to the driver */
+               __attribute__((aligned(sizeof(kernel_ulong_t))));
 /* SSB core, see drivers/ssb/ */
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at

Reply via email to