[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>
diff --git a/include/linux/mod_devicetable.h b/include/linux/mod_devicetable.h
index 8a8dc82..9b6d051 100644
--- a/include/linux/mod_devicetable.h
+++ b/include/linux/mod_devicetable.h
@@ -191,12 +191,22 @@
/* 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