diff options
| author | Len Brown <len.brown@intel.com> | 2009-12-16 02:20:58 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2009-12-16 02:20:58 -0500 |
| commit | 1a544d28dd2fd7c90bb23118ab0ca09b1304a50c (patch) | |
| tree | 891bedc62116b0e68c277d14dd749b94cc4d4f0b /include | |
| parent | 689a8ab32fa0ba11c4005b3733e59fb7094c2870 (diff) | |
| parent | 9e368fa011d4e0aa050db348d69514900520e40b (diff) | |
| download | op-kernel-dev-1a544d28dd2fd7c90bb23118ab0ca09b1304a50c.zip op-kernel-dev-1a544d28dd2fd7c90bb23118ab0ca09b1304a50c.tar.gz | |
Merge branch 'ipmi' into release
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/pnp.h | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/include/linux/pnp.h b/include/linux/pnp.h index fddfafa..7c4193e 100644 --- a/include/linux/pnp.h +++ b/include/linux/pnp.h @@ -334,6 +334,19 @@ extern struct pnp_protocol pnpbios_protocol; #define pnp_device_is_pnpbios(dev) 0 #endif +#ifdef CONFIG_PNPACPI +extern struct pnp_protocol pnpacpi_protocol; + +static inline struct acpi_device *pnp_acpi_device(struct pnp_dev *dev) +{ + if (dev->protocol == &pnpacpi_protocol) + return dev->data; + return NULL; +} +#else +#define pnp_acpi_device(dev) 0 +#endif + /* status */ #define PNP_READY 0x0000 #define PNP_ATTACHED 0x0001 |
