diff options
author | Len Brown <len.brown@intel.com> | 2007-03-09 23:19:50 -0500 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2007-03-09 23:19:50 -0500 |
commit | 63e34ca93a62f472144db60fa3b81111c0d15721 (patch) | |
tree | 2137a4b98360833e78cbb8edd5dce5b2ab5a0a60 /drivers/acpi/Kconfig | |
parent | 51e7fff1c2b763da910db3a875eac5b992df91d9 (diff) | |
parent | 9327f46ee28116b17f15f6505edd90f905908d62 (diff) |
Pull misc-for-upstream into release branch
Diffstat (limited to 'drivers/acpi/Kconfig')
-rw-r--r-- | drivers/acpi/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig index 4a3220b218d8..e2ce4a9c1c92 100644 --- a/drivers/acpi/Kconfig +++ b/drivers/acpi/Kconfig | |||
@@ -7,6 +7,7 @@ menu "ACPI (Advanced Configuration and Power Interface) Support" | |||
7 | depends on !X86_VISWS | 7 | depends on !X86_VISWS |
8 | depends on !IA64_HP_SIM | 8 | depends on !IA64_HP_SIM |
9 | depends on IA64 || X86 | 9 | depends on IA64 || X86 |
10 | depends on PM | ||
10 | 11 | ||
11 | config ACPI | 12 | config ACPI |
12 | bool "ACPI Support" | 13 | bool "ACPI Support" |