From d07a3c1bfde96132e93bd47927e6477882e59727 Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 18 Jun 2012 15:38:22 -0700
Subject: [PATCH] --- yaml --- r: 316866 b: refs/heads/master c:
 fec1868e23099023bc545e199b78d99840b1abc9 h: refs/heads/master v: v3

---
 [refs]                                | 2 +-
 trunk/include/linux/mod_devicetable.h | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index a4c15121440f..80701220bf89 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 71c421dbd9d87ffe6229816a04b759ec5613014d
+refs/heads/master: fec1868e23099023bc545e199b78d99840b1abc9
diff --git a/trunk/include/linux/mod_devicetable.h b/trunk/include/linux/mod_devicetable.h
index 7771d453e5f3..6955045199b0 100644
--- a/trunk/include/linux/mod_devicetable.h
+++ b/trunk/include/linux/mod_devicetable.h
@@ -122,7 +122,8 @@ struct usb_device_id {
 	__u8		bInterfaceNumber;
 
 	/* not matched against */
-	kernel_ulong_t	driver_info;
+	kernel_ulong_t	driver_info
+		__attribute__((aligned(sizeof(kernel_ulong_t))));
 };
 
 /* Some useful macros to use to create struct usb_device_id */