summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLen Brown <lenb@toshiba.hsd1.ma.comcast.net>2005-05-27 04:53:27 -0400
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-05-27 08:15:05 -0700
commit3e11c3ce0a4ce3d30802babccb0e5f881778ccf1 (patch)
tree5dfea042e20045f05c9e2660ef04d228968156e0
parent9920e91450ee9b373dd4924f79d287a267b8f6a3 (diff)
downloadblackbird-op-linux-3e11c3ce0a4ce3d30802babccb0e5f881778ccf1.tar.gz
blackbird-op-linux-3e11c3ce0a4ce3d30802babccb0e5f881778ccf1.zip
[PATCH] ACPI build fix
Fix 2.6.12 CONFIG_ACPI=n build regression. CONFIG_ACPI_BOOT shall be set only if CONFIG_ACPI. Signed-off-by: Len Brown <len.brown@intel.com> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--drivers/acpi/Kconfig5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
index 0400a52d5085..670fdb5142d1 100644
--- a/drivers/acpi/Kconfig
+++ b/drivers/acpi/Kconfig
@@ -40,13 +40,12 @@ config ACPI
available at:
<http://www.acpi.info>
+if ACPI
+
config ACPI_BOOT
bool
- depends on ACPI || X86_HT
default y
-if ACPI
-
config ACPI_INTERPRETER
bool
depends on !IA64_SGI_SN
OpenPOWER on IntegriCloud