From 6ed69c67d3081046d8faf37ae8fe73e08f321458 Mon Sep 17 00:00:00 2001
From: Jiri Slaby <jirislaby@gmail.com>
Date: Mon, 26 May 2008 16:08:40 +0200
Subject: [PATCH] --- yaml --- r: 97390 b: refs/heads/master c:
 2548baa07ddf37ea8604e9627f042616d1cdc43e 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 41225910a701..2e6bf7da2ae2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7271e60a950b3677f136a31e084bc4b0463c7018
+refs/heads/master: 2548baa07ddf37ea8604e9627f042616d1cdc43e
diff --git a/trunk/include/linux/mod_devicetable.h b/trunk/include/linux/mod_devicetable.h
index d73eceaa7afb..69b2342d5ebb 100644
--- a/trunk/include/linux/mod_devicetable.h
+++ b/trunk/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))));
 };