diff options
| author | Linus Torvalds <torvalds@home.transmeta.com> | 2003-04-09 20:26:23 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@home.transmeta.com> | 2003-04-09 20:26:23 -0700 |
| commit | 9c2cfa15e3aae1dd9d74ea42dc35c109937dc971 (patch) | |
| tree | d9562c2cf3a14ca3d8e79322f883ebe2cf8961ac /include/linux | |
| parent | 5ca4f809c163ac6bb6bcf666f054cc5df0a8844e (diff) | |
| parent | 29d1acb7e146c9e262f211516d5205809c8c90b6 (diff) | |
Merge http://linux-sound.bkbits.net/linux-sound
into home.transmeta.com:/home/torvalds/v2.5/linux
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/pnp.h | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/include/linux/pnp.h b/include/linux/pnp.h index 73d74d0e52a7..d0249ab40676 100644 --- a/include/linux/pnp.h +++ b/include/linux/pnp.h @@ -274,12 +274,31 @@ struct pnp_fixup { #define pnp_can_configure(dev) ((!(dev)->active) && ((dev)->config_mode & PNP_CONFIG_AUTO) && \ ((dev)->capabilities & PNP_CONFIGURABLE)) +#ifdef CONFIG_ISAPNP +extern struct pnp_protocol isapnp_protocol; +#define pnp_device_is_isapnp(dev) ((dev)->protocol == (&isapnp_protocol)) +#else +#define pnp_device_is_isapnp(dev) 0 +#endif + +#ifdef CONFIG_PNPBIOS +extern struct pnp_protocol pnpbios_protocol; +#define pnp_device_is_pnpbios(dev) ((dev)->protocol == (&pnpbios_protocol)) +#else +#define pnp_device_is_pnpbios(dev) 0 +#endif + + /* status */ #define PNP_READY 0x0000 #define PNP_ATTACHED 0x0001 #define PNP_BUSY 0x0002 #define PNP_FAULTY 0x0004 +/* isapnp specific macros */ + +#define isapnp_card_number(dev) ((dev)->card ? (dev)->card->number : -1) +#define isapnp_csn_number(dev) ((dev)->number) /* * Driver Management |