From 26ccd24765b1295b68a71d6b20b7ab77180f13aa Mon Sep 17 00:00:00 2001
From: Andreas Schwab <schwab@suse.de>
Date: Sun, 26 Oct 2008 00:30:18 +0200
Subject: [PATCH] --- yaml --- r: 118111 b: refs/heads/master c:
 8175fe2dda1c93a9c596921c8ed4a0b4baccdefe h: refs/heads/master i:   118109:
 c35c17e8082121072fa4204dc13ade30fed614c2   118107:
 4dec2f435361aea15e668c57402c3cca694ca7e2   118103:
 e00501f12a33e0759b0453413e21f43affa6be56   118095:
 b2fe9754759e4355c2cceea1172611e09d694aef   118079:
 20e499f75413e21486ab249af7c4019c398041f9 v: v3

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

diff --git a/[refs] b/[refs]
index 1302f0b304cf..2dcf6298fc53 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b170060c6ccd719eebb53b10c98df2a4e6968f28
+refs/heads/master: 8175fe2dda1c93a9c596921c8ed4a0b4baccdefe
diff --git a/trunk/include/linux/mod_devicetable.h b/trunk/include/linux/mod_devicetable.h
index eb71b45fdf5a..97b91d1abb43 100644
--- a/trunk/include/linux/mod_devicetable.h
+++ b/trunk/include/linux/mod_devicetable.h
@@ -135,6 +135,7 @@ struct usb_device_id {
 
 struct hid_device_id {
 	__u16 bus;
+	__u16 pad1;
 	__u32 vendor;
 	__u32 product;
 	kernel_ulong_t driver_data