diff options
| author | Bjorn Helgaas <bjorn.helgaas@hp.com> | 2008-11-05 16:17:58 -0700 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2008-11-06 15:42:38 -0500 |
| commit | fefe5ab3d67b0ade6200fec5ed6f2812cbcbb658 (patch) | |
| tree | 9270a9aad04aeed7af52d795ee0eb4ba00218597 /drivers/acpi | |
| parent | 5b881479af4352791e5004b74e3639f1416c5fe4 (diff) | |
| download | kernel_samsung_smdk4412-fefe5ab3d67b0ade6200fec5ed6f2812cbcbb658.tar.gz kernel_samsung_smdk4412-fefe5ab3d67b0ade6200fec5ed6f2812cbcbb658.tar.bz2 kernel_samsung_smdk4412-fefe5ab3d67b0ade6200fec5ed6f2812cbcbb658.zip | |
ACPI: remove CONFIG_ACPI_POWER
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>
Diffstat (limited to 'drivers/acpi')
| -rw-r--r-- | drivers/acpi/Kconfig | 4 | ||||
| -rw-r--r-- | drivers/acpi/Makefile | 2 |
2 files changed, 1 insertions, 5 deletions
diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig index f4f63291750..4fa7866a9a5 100644 --- a/drivers/acpi/Kconfig +++ b/drivers/acpi/Kconfig @@ -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 diff --git a/drivers/acpi/Makefile b/drivers/acpi/Makefile index d91c027ece8..8017f63920c 100644 --- a/drivers/acpi/Makefile +++ b/drivers/acpi/Makefile @@ -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 |