diff --git a/[refs] b/[refs]
index 9e958991c44b..45ad1332d995 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 778382e08cce51b6268ca49449e5bd70c8413799
+refs/heads/master: c7afb48eb5147be9eb9789b4161462d246451ac2
diff --git a/trunk/include/linux/input.h b/trunk/include/linux/input.h
index b0e612dda0cf..f7ac97d834f6 100644
--- a/trunk/include/linux/input.h
+++ b/trunk/include/linux/input.h
@@ -805,6 +805,9 @@ struct ff_effect {
 
 #define FF_MAX		0x7f
 
+#ifdef LINUX_MOD_DEVICETABLE_H
+/* We only want this if mod_devicetable.h has been included -- that's
+   either in kernel space, or in scripts/mod/file2alias.c */
 struct input_device_id {
 
 	kernel_ulong_t flags;
@@ -823,6 +826,7 @@ struct input_device_id {
 
 	kernel_ulong_t driver_info;
 };
+#endif 
 
 /*
  * Structure for hotplug & device<->driver matching.