summaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorDominik Brodowski <linux@dominikbrodowski.net>2005-06-27 16:28:56 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-27 18:03:21 -0700
commitaecab27aeabaa897d69fc082686df314329830de (patch)
tree4637bd095fbcab2b2090b34118be1c1474ac88b6 /include/linux
parent0c7ab67602e65b3ba7aaa81f023b034cd7458ec6 (diff)
[PATCH] pcmcia: mod_devicetable.h fix for different sizes in kernel- and userspace
The size of pointers may differ between (userspace) modpost and (kernelspace) modules -- so fix mod_devicetable.h to reflect this possibility. Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include/linux')
-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 8a8dc82a941d..9b6d05172ed4 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