Merge git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched

[linux-2.6] / include / linux / mod_devicetable.h

diff --git a/include/linux/mod_devicetable.h b/include/linux/mod_devicetable.h
index 1632025f3e60a5cb53cc9cd3fc1a2bb05691d71c..4dc5fa8be781760aa307cff8d01488f270c47b9a 100644 (file)
--- a/include/linux/mod_devicetable.h
+++ b/include/linux/mod_devicetable.h
@@ -159,6 +159,13 @@ struct ap_device_id {
 
 #define AP_DEVICE_ID_MATCH_DEVICE_TYPE         0x01
 
+#define ACPI_ID_LEN    16 /* only 9 bytes needed here, 16 bytes are used */
+                          /* to workaround crosscompile issues */
+
+struct acpi_device_id {
+       __u8 id[ACPI_ID_LEN];
+       kernel_ulong_t driver_data;
+};
 
 #define PNP_ID_LEN     8
 #define PNP_MAX_DEVICES        8
@@ -262,6 +269,7 @@ struct i2c_device_id {
 
 /* Input */
 #define INPUT_DEVICE_ID_EV_MAX         0x1f
+#define INPUT_DEVICE_ID_KEY_MIN_INTERESTING    0x71
 #define INPUT_DEVICE_ID_KEY_MAX                0x1ff
 #define INPUT_DEVICE_ID_REL_MAX                0x0f
 #define INPUT_DEVICE_ID_ABS_MAX                0x3f
@@ -327,9 +335,9 @@ struct parisc_device_id {
        __u32   sversion;       /* 20 bits */
 };
 
-#define HWTYPE_ANY_ID          0xff
-#define HVERSION_REV_ANY_ID    0xff
-#define HVERSION_ANY_ID                0xffff
-#define SVERSION_ANY_ID                0xffffffff
+#define PA_HWTYPE_ANY_ID       0xff
+#define PA_HVERSION_REV_ANY_ID 0xff
+#define PA_HVERSION_ANY_ID     0xffff
+#define PA_SVERSION_ANY_ID     0xffffffff
 
 #endif /* LINUX_MOD_DEVICETABLE_H */