提交 90def62d 编写于 作者: R Rusty Russell

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

Signed-off-by: NRusty Russell <rusty@rustcorp.com.au>
上级 537b60d1
...@@ -43,10 +43,10 @@ ...@@ -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 { ...@@ -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__
......
...@@ -483,4 +483,11 @@ struct zorro_device_id { ...@@ -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 */
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册