3 files changed, 3 insertions, 34 deletions

diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
index 83cac52308db..3998c9d35fe1 100644
--- a/drivers/acpi/Kconfig
+++ b/drivers/acpi/Kconfig
@@ -3,7 +3,6 @@
 #
 
 menu "ACPI (Advanced Configuration and Power Interface) Support"
-        depends on PM
         depends on !X86_VISWS
         depends on !IA64_HP_SIM
         depends on IA64 || X86
@@ -11,6 +10,8 @@ menu "ACPI (Advanced Configuration and Power Interface) Support"
 config ACPI
         bool "ACPI Support"
         depends on IA64 || X86
+        select PM
+        select PCI
 
         default y
         ---help---
@@ -281,10 +282,6 @@ config ACPI_POWER
         bool
         default y
 
-config ACPI_PCI
-        bool
-        default PCI
-
 config ACPI_SYSTEM
         bool
         default y
diff --git a/drivers/acpi/Makefile b/drivers/acpi/Makefile
index b6a3c9192385..a18243488c66 100644
--- a/drivers/acpi/Makefile
+++ b/drivers/acpi/Makefile
@@ -44,7 +44,7 @@ obj-$(CONFIG_ACPI_EC)		+= ec.o
 obj-$(CONFIG_ACPI_FAN)          += fan.o
 obj-$(CONFIG_ACPI_VIDEO)        += video.o 
 obj-$(CONFIG_ACPI_HOTKEY)       += hotkey.o
-obj-$(CONFIG_ACPI_PCI)          += pci_root.o pci_link.o pci_irq.o pci_bind.o
+obj-y                           += pci_root.o pci_link.o pci_irq.o pci_bind.o
 obj-$(CONFIG_ACPI_POWER)        += power.o
 obj-$(CONFIG_ACPI_PROCESSOR)    += processor.o
 obj-$(CONFIG_ACPI_CONTAINER)    += container.o
diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c
index 81f0eb863a76..dc69d8760a54 100644
--- a/drivers/acpi/osl.c
+++ b/drivers/acpi/osl.c
@@ -86,13 +86,11 @@ acpi_status acpi_os_initialize1(void)
          * Initialize PCI configuration space access, as we'll need to access
          * it while walking the namespace (bus 0 and root bridges w/ _BBNs).
          */
-#ifdef CONFIG_ACPI_PCI
         if (!raw_pci_ops) {
                 printk(KERN_ERR PREFIX
                        "Access to PCI configuration space unavailable\n");
                 return AE_NULL_ENTRY;
         }
-#endif
         kacpid_wq = create_singlethread_workqueue("kacpid");
         BUG_ON(!kacpid_wq);
 
@@ -484,8 +482,6 @@ acpi_os_write_memory(acpi_physical_address phys_addr, u32 value, u32 width)
         return AE_OK;
 }
 
-#ifdef CONFIG_ACPI_PCI
-
 acpi_status
 acpi_os_read_pci_configuration(struct acpi_pci_id * pci_id, u32 reg,
                                void *value, u32 width)
@@ -618,30 +614,6 @@ void acpi_os_derive_pci_id(acpi_handle rhandle,	/* upper bound  */
         acpi_os_derive_pci_id_2(rhandle, chandle, id, &is_bridge, &bus_number);
 }
 
-#else                           /*!CONFIG_ACPI_PCI */
-
-acpi_status
-acpi_os_write_pci_configuration(struct acpi_pci_id * pci_id,
-                                u32 reg, acpi_integer value, u32 width)
-{
-        return AE_SUPPORT;
-}
-
-acpi_status
-acpi_os_read_pci_configuration(struct acpi_pci_id * pci_id,
-                               u32 reg, void *value, u32 width)
-{
-        return AE_SUPPORT;
-}
-
-void acpi_os_derive_pci_id(acpi_handle rhandle, /* upper bound  */
-                           acpi_handle chandle, /* current node */
-                           struct acpi_pci_id **id)
-{
-}
-
-#endif                          /*CONFIG_ACPI_PCI */
-
 static void acpi_os_execute_deferred(void *context)
 {
         struct acpi_os_dpc *dpc = NULL;