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) | |
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 fddfafaed024..7c4193eb0072 100644 --- a/include/linux/pnp.h +++ b/include/linux/pnp.h | |||
| @@ -334,6 +334,19 @@ extern struct pnp_protocol pnpbios_protocol; | |||
| 334 | #define pnp_device_is_pnpbios(dev) 0 | 334 | #define pnp_device_is_pnpbios(dev) 0 |
| 335 | #endif | 335 | #endif |
| 336 | 336 | ||
| 337 | #ifdef CONFIG_PNPACPI | ||
| 338 | extern struct pnp_protocol pnpacpi_protocol; | ||
| 339 | |||
| 340 | static inline struct acpi_device *pnp_acpi_device(struct pnp_dev *dev) | ||
| 341 | { | ||
| 342 | if (dev->protocol == &pnpacpi_protocol) | ||
| 343 | return dev->data; | ||
| 344 | return NULL; | ||
| 345 | } | ||
| 346 | #else | ||
| 347 | #define pnp_acpi_device(dev) 0 | ||
| 348 | #endif | ||
| 349 | |||
| 337 | /* status */ | 350 | /* status */ |
| 338 | #define PNP_READY 0x0000 | 351 | #define PNP_READY 0x0000 |
| 339 | #define PNP_ATTACHED 0x0001 | 352 | #define PNP_ATTACHED 0x0001 |