Merge head 'drm-via' of master.kernel.org:/pub/scm/linux/kernel/git/airlied/drm-2.6

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

diff --git a/include/linux/mod_devicetable.h b/include/linux/mod_devicetable.h
index c0106d68bb6d6771b0ee4ea5d45136fb295cd292..dce53ac1625d8cea5c78b1940aedc6441dc52d63 100644 (file)
--- a/include/linux/mod_devicetable.h
+++ b/include/linux/mod_devicetable.h
@@ -174,6 +174,17 @@ struct serio_device_id {
        __u8 proto;
 };
 
+/*
+ * Struct used for matching a device
+ */
+struct of_device_id
+{
+       char    name[32];
+       char    type[32];
+       char    compatible[128];
+       void    *data;
+};
+
 
 /* PCMCIA */
 
@@ -191,12 +202,22 @@ struct pcmcia_device_id {
        /* for pseude multi-function devices */
        __u8            device_no;
 
-       const char *    prod_id[4];
        __u32           prod_id_hash[4];
 
+       /* not matched against in kernelspace*/
+#ifdef __KERNEL__
+       const char *    prod_id[4];
+#else
+       kernel_ulong_t  prod_id[4];
+#endif
+
        /* not matched against */
        kernel_ulong_t  driver_info;
+#ifdef __KERNEL__
        char *          cisfile;
+#else
+       kernel_ulong_t  cisfile;
+#endif
 };
 
 #define PCMCIA_DEV_ID_MATCH_MANF_ID    0x0001
@@ -209,5 +230,6 @@ struct pcmcia_device_id {
 #define PCMCIA_DEV_ID_MATCH_PROD_ID4   0x0080
 #define PCMCIA_DEV_ID_MATCH_DEVICE_NO  0x0100
 #define PCMCIA_DEV_ID_MATCH_FAKE_CIS   0x0200
+#define PCMCIA_DEV_ID_MATCH_ANONYMOUS  0x0400
 
 #endif /* LINUX_MOD_DEVICETABLE_H */