isapnp: move definitions to mod_devicetable.h so file2alias can reach them. (90def62d) · Commits · e / devices / android_kernel_samsung_universal8895

include/linux/isapnp.h

+1 −7

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

		#ifdef __KERNEL__
		#include <linux/mod_devicetable.h>

		#define DEVICE_COUNT_COMPATIBLE 4

		#define ISAPNP_ANY_ID 0xffff
		#define ISAPNP_CARD_DEVS 8

		#define ISAPNP_CARD_ID(_va, _vb, _vc, _device) \
		@@ -74,12 +74,6 @@ struct isapnp_card_id {
		#define ISAPNP_DEVICE_SINGLE_END \
		.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))

		#define __ISAPNP__

+7 −0

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

		#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 */