From: Anton Blanchard <anton@samba.org>

Wrap some ACPI specific headers. ACPI hasnt taken over the whole world yet.

Signed-off-by: Anton Blanchard <anton@samba.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 drivers/pci/hotplug/pciehp_hpc.c |    4 ++++
 1 file changed, 4 insertions(+)

diff -puN drivers/pci/hotplug/pciehp_hpc.c~fix-pciehp-driver-on-non-acpi-systems drivers/pci/hotplug/pciehp_hpc.c
--- devel/drivers/pci/hotplug/pciehp_hpc.c~fix-pciehp-driver-on-non-acpi-systems	2006-06-01 20:38:48.000000000 -0700
+++ devel-akpm/drivers/pci/hotplug/pciehp_hpc.c	2006-06-01 20:38:48.000000000 -0700
@@ -38,10 +38,14 @@
 
 #include "../pci.h"
 #include "pciehp.h"
+
+#ifdef CONFIG_ACPI
 #include <acpi/acpi.h>
 #include <acpi/acpi_bus.h>
 #include <acpi/actypes.h>
 #include <linux/pci-acpi.h>
+#endif
+
 #ifdef DEBUG
 #define DBG_K_TRACE_ENTRY      ((unsigned int)0x00000001)	/* On function entry */
 #define DBG_K_TRACE_EXIT       ((unsigned int)0x00000002)	/* On function exit */
_