aboutsummaryrefslogtreecommitdiff
path: root/include/linux/pnp.h
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2010-01-12 12:59:05 +0000
committerMark Brown <broonie@opensource.wolfsonmicro.com>2010-01-12 12:59:05 +0000
commit163849ea9b4c5d50fbd324692461983d18faadad (patch)
tree7176a18fea53560eb4092aa103d94a266ab4e60d /include/linux/pnp.h
parent2138301e1687bd4f22aa2b4df4829b6ffdae19bc (diff)
parent5ee518ecbcb5934e284ea51a19a939c891f5f7ea (diff)
Merge branch 'for-2.6.33' into for-2.6.34
Diffstat (limited to 'include/linux/pnp.h')
-rw-r--r--include/linux/pnp.h13
1 files changed, 13 insertions, 0 deletions
diff --git a/include/linux/pnp.h b/include/linux/pnp.h
index fddfafaed02..7c4193eb007 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