Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>

+8 -7
+1 -7
include/linux/isapnp.h
··· 43 43 */ 44 44 45 45 #ifdef __KERNEL__ 46 + #include <linux/mod_devicetable.h> 46 47 47 48 #define DEVICE_COUNT_COMPATIBLE 4 48 49 49 - #define ISAPNP_ANY_ID 0xffff 50 50 #define ISAPNP_CARD_DEVS 8 51 51 52 52 #define ISAPNP_CARD_ID(_va, _vb, _vc, _device) \ ··· 73 73 .vendor = ISAPNP_VENDOR(_dva, _dvb, _dvc), .function = ISAPNP_FUNCTION(_dfunction) 74 74 #define ISAPNP_DEVICE_SINGLE_END \ 75 75 .card_vendor = 0, .card_device = 0 76 - 77 - struct isapnp_device_id { 78 - unsigned short card_vendor, card_device; 79 - unsigned short vendor, function; 80 - unsigned long driver_data; /* data private to the driver */ 81 - }; 82 76 83 77 #if defined(CONFIG_ISAPNP) || (defined(CONFIG_ISAPNP_MODULE) && defined(MODULE)) 84 78
+7
include/linux/mod_devicetable.h
··· 483 483 484 484 #define ZORRO_DEVICE_MODALIAS_FMT "zorro:i%08X" 485 485 486 + #define ISAPNP_ANY_ID 0xffff 487 + struct isapnp_device_id { 488 + unsigned short card_vendor, card_device; 489 + unsigned short vendor, function; 490 + kernel_ulong_t driver_data; /* data private to the driver */ 491 + }; 492 + 486 493 #endif /* LINUX_MOD_DEVICETABLE_H */