ACPI: remove CONFIG_ACPI_POWER
authorBjorn Helgaas <bjorn.helgaas@hp.com>
Wed, 5 Nov 2008 23:17:58 +0000 (16:17 -0700)
committerLen Brown <len.brown@intel.com>
Thu, 6 Nov 2008 20:42:38 +0000 (15:42 -0500)
Remove CONFIG_ACPI_POWER.  It was always set the same as CONFIG_ACPI,
and it had no menu label, so there was no way to set it to anything
other than "y".

The interfaces under CONFIG_ACPI_POWER (acpi_device_sleep_wake(),
acpi_power_transition(), etc) are called unconditionally from the
ACPI core, so we already depend on it always being present.

Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
Signed-off-by: Len Brown <len.brown@intel.com>
drivers/acpi/Kconfig
drivers/acpi/Makefile
include/acpi/acpi_drivers.h

index f4f6329175094383e61749a6dbf893a3ecda92d9..4fa7866a9a5ee9c994e1ad29d67509aba0f12b8e 100644 (file)
@@ -341,10 +341,6 @@ config ACPI_PCI_SLOT
          help you correlate PCI bus addresses with the physical geography
          of your slots. If you are unsure, say N.
 
-config ACPI_POWER
-       bool
-       default y
-
 config ACPI_SYSTEM
        bool
        default y
index d91c027ece8f6409cc50a83023ac7821a4f9b1a4..8017f63920c458519c1140aa4f0ac6ba6b57dca2 100644 (file)
@@ -51,7 +51,7 @@ obj-$(CONFIG_ACPI_PCI_SLOT)   += pci_slot.o
 obj-$(CONFIG_ACPI_PROCESSOR)   += processor.o
 obj-$(CONFIG_ACPI_CONTAINER)   += container.o
 obj-$(CONFIG_ACPI_THERMAL)     += thermal.o
-obj-$(CONFIG_ACPI_POWER)       += power.o
+obj-y                          += power.o
 obj-$(CONFIG_ACPI_SYSTEM)      += system.o event.o
 obj-$(CONFIG_ACPI_DEBUG)       += debug.o
 obj-$(CONFIG_ACPI_NUMA)                += numa.o
index cf04c6011c2acadf4624a7a39f06fd66668383f4..818215f89e7ab8ac91dd96916737f5a3e1b1e79f 100644 (file)
@@ -86,7 +86,6 @@ struct pci_bus *pci_acpi_scan_root(struct acpi_device *device, int domain,
                                   Power Resource
    -------------------------------------------------------------------------- */
 
-#ifdef CONFIG_ACPI_POWER
 int acpi_device_sleep_wake(struct acpi_device *dev,
                            int enable, int sleep_state, int dev_state);
 int acpi_enable_wakeup_device_power(struct acpi_device *dev, int sleep_state);
@@ -94,7 +93,6 @@ int acpi_disable_wakeup_device_power(struct acpi_device *dev);
 int acpi_power_get_inferred_state(struct acpi_device *device);
 int acpi_power_transition(struct acpi_device *device, int state);
 extern int acpi_power_nocheck;
-#endif
 
 /* --------------------------------------------------------------------------
                                   Embedded Controller