Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aecab27a authored by Dominik Brodowski's avatar Dominik Brodowski Committed by Linus Torvalds
Browse files

[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: default avatarDominik Brodowski <linux@dominikbrodowski.net>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 0c7ab676

include/linux/mod_devicetable.h

+11 −1
Original line number Original line Diff line number Diff line
@@ -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