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

Commit 90def62d authored by Rusty Russell's avatar Rusty Russell
Browse files

isapnp: move definitions to mod_devicetable.h so file2alias can reach them. 



Signed-off-by: default avatarRusty Russell <rusty@rustcorp.com.au>
parent 537b60d1

include/linux/isapnp.h

+1 −7
Original line number Original line Diff line number Diff line
@@ -43,10 +43,10 @@ 
 */

 */





#ifdef __KERNEL__

#ifdef __KERNEL__

#include <linux/mod_devicetable.h>





#define DEVICE_COUNT_COMPATIBLE 4

#define DEVICE_COUNT_COMPATIBLE 4





#define ISAPNP_ANY_ID		0xffff

#define ISAPNP_CARD_DEVS	8

#define ISAPNP_CARD_DEVS	8





#define ISAPNP_CARD_ID(_va, _vb, _vc, _device) \

#define ISAPNP_CARD_ID(_va, _vb, _vc, _device) \
@@ -74,12 +74,6 @@ struct isapnp_card_id { 
#define ISAPNP_DEVICE_SINGLE_END \

#define ISAPNP_DEVICE_SINGLE_END \

		.card_vendor = 0, .card_device = 0

		.card_vendor = 0, .card_device = 0





struct isapnp_device_id {

	unsigned short card_vendor, card_device;

	unsigned short vendor, function;

	unsigned long driver_data;	/* data private to the driver */

};



#if defined(CONFIG_ISAPNP) || (defined(CONFIG_ISAPNP_MODULE) && defined(MODULE))

#if defined(CONFIG_ISAPNP) || (defined(CONFIG_ISAPNP_MODULE) && defined(MODULE))





#define __ISAPNP__

#define __ISAPNP__

include/linux/mod_devicetable.h

+7 −0
Original line number Original line Diff line number Diff line
@@ -483,4 +483,11 @@ struct zorro_device_id { 




#define ZORRO_DEVICE_MODALIAS_FMT	"zorro:i%08X"

#define ZORRO_DEVICE_MODALIAS_FMT	"zorro:i%08X"





#define ISAPNP_ANY_ID		0xffff

struct isapnp_device_id {

	unsigned short card_vendor, card_device;

	unsigned short vendor, function;

	kernel_ulong_t driver_data;	/* data private to the driver */

};



#endif /* LINUX_MOD_DEVICETABLE_H */
 
#endif /* LINUX_MOD_DEVICETABLE_H */