mirror of
https://github.com/Fishwaldo/Star64_linux.git
synced 2025-06-27 17:11:46 +00:00
[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>
This commit is contained in:
parent
0c7ab67602
commit
aecab27aea
1 changed files with 11 additions and 1 deletions
|
@ -191,12 +191,22 @@ struct pcmcia_device_id {
|
||||||
/* for pseude multi-function devices */
|
/* for pseude multi-function devices */
|
||||||
__u8 device_no;
|
__u8 device_no;
|
||||||
|
|
||||||
const char * prod_id[4];
|
|
||||||
__u32 prod_id_hash[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 */
|
/* not matched against */
|
||||||
kernel_ulong_t driver_info;
|
kernel_ulong_t driver_info;
|
||||||
|
#ifdef __KERNEL__
|
||||||
char * cisfile;
|
char * cisfile;
|
||||||
|
#else
|
||||||
|
kernel_ulong_t cisfile;
|
||||||
|
#endif
|
||||||
};
|
};
|
||||||
|
|
||||||
#define PCMCIA_DEV_ID_MATCH_MANF_ID 0x0001
|
#define PCMCIA_DEV_ID_MATCH_MANF_ID 0x0001
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue