commit c636f753b5b943f08fb3490e7f1a9b47aa5cc7d3
author Len Brown <len.brown@intel.com> Tue May 19 23:47:38 2009 -0400
committer Len Brown <len.brown@intel.com> Fri Jun 12 20:49:50 2009 -0400
tree 58eb3843d15fa309ecbd9cfdd0bf67bf10128d5a
parent 07a2039b8eb0af4ff464efd3dfd95de5c02648c6

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>

arch/x86/kernel/acpi/boot.c

diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c
index 723989d7..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