aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--include/linux/mod_devicetable.h12
1 files changed, 11 insertions, 1 deletions
diff --git a/include/linux/mod_devicetable.h b/include/linux/mod_devicetable.h
index 8a8dc82a941..9b6d05172ed 100644
--- a/include/linux/mod_devicetable.h
+++ b/include/linux/mod_devicetable.h
@@ -191,12 +191,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