From: Len Brown <len.brown@intel.com>
Date: Wed, 20 May 2009 03:47:38 +0000 (-0400)
Subject: ACPI: delete dead acpi_disabled setting code
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=c636f753b5b943f08fb3490e7f1a9b47aa5cc7d3;p=linux-beck.git

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>
---

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