From 5ca1955f90f2a3923c05eb4309f132f4a41694af Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <gregkh@suse.de>
Date: Thu, 25 Aug 2011 10:25:37 -0700
Subject: [PATCH] --- yaml --- r: 267915 b: refs/heads/master c:
 a91befc116f424883602fb7b57b63b5fcfe18719 h: refs/heads/master i:   267913:
 490c03b07b33e822571c493dede15e5112d8a3fe   267911:
 4988dbffc5e9616059c40eaf1fd7ad4119d14e6b v: v3

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

diff --git a/[refs] b/[refs]
index f2738a1e58b3..81ba23884bd2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 17be18c2b5f5c8acd75e4edf1211abf2cfd60fa5
+refs/heads/master: a91befc116f424883602fb7b57b63b5fcfe18719
diff --git a/trunk/include/linux/mod_devicetable.h b/trunk/include/linux/mod_devicetable.h
index 5a123774c2e6..468819cdde87 100644
--- a/trunk/include/linux/mod_devicetable.h
+++ b/trunk/include/linux/mod_devicetable.h
@@ -410,6 +410,8 @@ struct virtio_device_id {
  */
 struct hv_vmbus_device_id {
 	__u8 guid[16];
+	kernel_ulong_t driver_data	/* Data private to the driver */
+			__attribute__((aligned(sizeof(kernel_ulong_t))));
 };
 
 /* i2c */