Merge tag 'v3.7-rc3' into for-linus to sync up with recent USB changes

1 files changed, 9 insertions, 1 deletions

diff --git a/include/linux/mod_devicetable.h b/include/linux/mod_devicetable.h
index 6955045199b0..fed3def62818 100644
--- a/include/linux/mod_devicetable.h
+++ b/include/linux/mod_devicetable.h
@@ -232,7 +232,7 @@ struct of_device_id
         char    type[32];
         char    compatible[128];
 #ifdef __KERNEL__
-        void    *data;
+        const void *data;
 #else
         kernel_ulong_t data;
 #endif
@@ -600,4 +600,12 @@ struct x86_cpu_id {
 #define X86_MODEL_ANY  0
 #define X86_FEATURE_ANY 0       /* Same as FPU, you can't test for that */
 
+#define IPACK_ANY_FORMAT 0xff
+#define IPACK_ANY_ID (~0)
+struct ipack_device_id {
+        __u8  format;                   /* Format version or IPACK_ANY_ID */
+        __u32 vendor;                   /* Vendor ID or IPACK_ANY_ID */
+        __u32 device;                   /* Device ID or IPACK_ANY_ID */
+};
+
 #endif /* LINUX_MOD_DEVICETABLE_H */