aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/mod_devicetable.h
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-06-18 18:38:22 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-06-18 18:38:22 -0400
commitfec1868e23099023bc545e199b78d99840b1abc9 (patch)
treee176335518fc851fff36d02a0fec051e30581d1c /include/linux/mod_devicetable.h
parent71c421dbd9d87ffe6229816a04b759ec5613014d (diff)
USB: properly pad out usb_device_id.driver_info
On some systems, struct usb_device_id doesn't align properly due to the recent changes in it. So pad out the driver_info field to align on a boundry that systems can handle it. Reported-by: Geert Uytterhoeven <geert@linux-m68k.org> Acked-by: Geert Uytterhoeven <geert@linux-m68k.org> Cc: Bjørn Mork <bjorn@mork.no> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include/linux/mod_devicetable.h')
-rw-r--r--include/linux/mod_devicetable.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/mod_devicetable.h b/include/linux/mod_devicetable.h
index 7771d453e5f3..6955045199b0 100644
--- a/include/linux/mod_devicetable.h
+++ b/include/linux/mod_devicetable.h
@@ -122,7 +122,8 @@ struct usb_device_id {
122 __u8 bInterfaceNumber; 122 __u8 bInterfaceNumber;
123 123
124 /* not matched against */ 124 /* not matched against */
125 kernel_ulong_t driver_info; 125 kernel_ulong_t driver_info
126 __attribute__((aligned(sizeof(kernel_ulong_t))));
126}; 127};
127 128
128/* Some useful macros to use to create struct usb_device_id */ 129/* Some useful macros to use to create struct usb_device_id */