The patch titled
     sdio: fix module device table definition for m68k
has been removed from the -mm tree.  Its filename was
     sdio-fix-module-device-table-definition-for-m68k.patch

This patch was dropped because it was merged into mainline or a subsystem tree

The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/

------------------------------------------------------
Subject: sdio: fix module device table definition for m68k
From: Al Viro <[EMAIL PROTECTED]>

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]>
---

 include/linux/mod_devicetable.h |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff -puN 
include/linux/mod_devicetable.h~sdio-fix-module-device-table-definition-for-m68k
 include/linux/mod_devicetable.h
--- 
a/include/linux/mod_devicetable.h~sdio-fix-module-device-table-definition-for-m68k
+++ a/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/ */
_

Patches currently in -mm which might be from [EMAIL PROTECTED] are

origin.patch
slab-leaks3-default-y.patch

-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to