Merge branch 'linus' into x86/pebs

1 files changed, 2 insertions, 1 deletions

diff --git a/include/linux/mod_devicetable.h b/include/linux/mod_devicetable.h
index d73eceaa7afb..69b2342d5ebb 100644
--- a/include/linux/mod_devicetable.h
+++ b/include/linux/mod_devicetable.h
@@ -375,7 +375,8 @@ struct virtio_device_id {
 
 struct i2c_device_id {
         char name[I2C_NAME_SIZE];
-        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))));
 };