From 098895170239bdcf2cbfabe825282cca5a518a2d Mon Sep 17 00:00:00 2001 From: Bjorn Helgaas Date: Thu, 19 Feb 2009 12:56:16 -0700 Subject: [PATCH] --- yaml --- r: 131664 b: refs/heads/master c: ba193d64abfe644e8752affa310a368eda01f46e h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/acpi/Kconfig | 7 ------- trunk/drivers/acpi/Makefile | 2 +- 3 files changed, 2 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index 68a35e4c0b63..982fa7c7e04e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4898c2b2f04051e19f4230683c0f0b15f71af887 +refs/heads/master: ba193d64abfe644e8752affa310a368eda01f46e diff --git a/trunk/drivers/acpi/Kconfig b/trunk/drivers/acpi/Kconfig index a7799a99f2d9..8a851d0f4384 100644 --- a/trunk/drivers/acpi/Kconfig +++ b/trunk/drivers/acpi/Kconfig @@ -254,13 +254,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_SYSTEM - bool - default y - help - This driver will enable your system to shut down using ACPI, and - dump your ACPI DSDT table using /proc/acpi/dsdt. - config X86_PM_TIMER bool "Power Management Timer Support" if EMBEDDED depends on X86 diff --git a/trunk/drivers/acpi/Makefile b/trunk/drivers/acpi/Makefile index 65d90c720b5a..b130ea0d0759 100644 --- a/trunk/drivers/acpi/Makefile +++ b/trunk/drivers/acpi/Makefile @@ -52,7 +52,7 @@ obj-$(CONFIG_ACPI_PROCESSOR) += processor.o obj-$(CONFIG_ACPI_CONTAINER) += container.o obj-$(CONFIG_ACPI_THERMAL) += thermal.o obj-y += power.o -obj-$(CONFIG_ACPI_SYSTEM) += system.o event.o +obj-y += system.o event.o obj-$(CONFIG_ACPI_DEBUG) += debug.o obj-$(CONFIG_ACPI_NUMA) += numa.o obj-$(CONFIG_ACPI_HOTPLUG_MEMORY) += acpi_memhotplug.o