aboutsummaryrefslogtreecommitdiff
path: root/drivers/pci/hotplug/pciehp.h
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2006-08-19 17:25:34 -0400
committerJeff Garzik <jeff@garzik.org>2006-08-19 17:25:34 -0400
commit41ace1861a93f12f70ff10026fb1539fea38fcf8 (patch)
treec6d841ae9b73d6b7d6a887c21ce378cebc9c97f7 /drivers/pci/hotplug/pciehp.h
parent09e590e5d5a93f2eaa748a89c623258e6bad1648 (diff)
parentef7d1b244fa6c94fb76d5f787b8629df64ea4046 (diff)
Merge branch 'master' into upstream-fixes
Diffstat (limited to 'drivers/pci/hotplug/pciehp.h')
-rw-r--r--drivers/pci/hotplug/pciehp.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/pci/hotplug/pciehp.h b/drivers/pci/hotplug/pciehp.h
index ce89f581586..eaea9d36a1b 100644
--- a/drivers/pci/hotplug/pciehp.h
+++ b/drivers/pci/hotplug/pciehp.h
@@ -279,6 +279,11 @@ struct hpc_ops {
#ifdef CONFIG_ACPI
+#include <acpi/acpi.h>
+#include <acpi/acpi_bus.h>
+#include <acpi/actypes.h>
+#include <linux/pci-acpi.h>
+
#define pciehp_get_hp_hw_control_from_firmware(dev) \
pciehp_acpi_get_hp_hw_control_from_firmware(dev)
static inline int pciehp_get_hp_params_from_firmware(struct pci_dev *dev,