summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2009-05-19 23:47:38 -0400
committerLen Brown <len.brown@intel.com>2009-06-12 20:49:50 -0400
commitc636f753b5b943f08fb3490e7f1a9b47aa5cc7d3 (patch)
tree58eb3843d15fa309ecbd9cfdd0bf67bf10128d5a /arch
parent07a2039b8eb0af4ff464efd3dfd95de5c02648c6 (diff)
downloadop-kernel-dev-c636f753b5b943f08fb3490e7f1a9b47aa5cc7d3.zip
op-kernel-dev-c636f753b5b943f08fb3490e7f1a9b47aa5cc7d3.tar.gz
ACPI: delete dead acpi_disabled setting code
Testing CONFIG_ACPI inside boot.c is a waste of text, since boot.c is built only when CONFIG_ACPI=y Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/kernel/acpi/boot.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c
index 723989d..d4acedf 100644
--- a/arch/x86/kernel/acpi/boot.c
+++ b/arch/x86/kernel/acpi/boot.c
@@ -43,11 +43,7 @@
static int __initdata acpi_force = 0;
u32 acpi_rsdt_forced;
-#ifdef CONFIG_ACPI
-int acpi_disabled = 0;
-#else
-int acpi_disabled = 1;
-#endif
+int acpi_disabled;
EXPORT_SYMBOL(acpi_disabled);
#ifdef CONFIG_X86_64
OpenPOWER on IntegriCloud