aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/acpi/Kconfig
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2007-02-03 01:39:07 -0500
committerLen Brown <len.brown@intel.com>2007-02-03 01:39:07 -0500
commit6b259707d53f0f25f0b24318a0774f1ae7e7e92c (patch)
tree9f05353c2134d57607ee9780e3a35e56952ea2e8 /drivers/acpi/Kconfig
parenta4144e451ce1951e8dad2aa8e2288f75ab745172 (diff)
parentdb50342205deabaff9ce1fbe53d5ba351992fa08 (diff)
Pull trivial into test branch
Conflicts: drivers/acpi/scan.c Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/acpi/Kconfig')
-rw-r--r--drivers/acpi/Kconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
index 2ac2922be1bf..20eacc2c9e0e 100644
--- a/drivers/acpi/Kconfig
+++ b/drivers/acpi/Kconfig
@@ -3,6 +3,7 @@
3# 3#
4 4
5menu "ACPI (Advanced Configuration and Power Interface) Support" 5menu "ACPI (Advanced Configuration and Power Interface) Support"
6 depends on !X86_NUMAQ
6 depends on !X86_VISWS 7 depends on !X86_VISWS
7 depends on !IA64_HP_SIM 8 depends on !IA64_HP_SIM
8 depends on IA64 || X86 9 depends on IA64 || X86