[TRIVIAL] sanitize power management config menus

Tomas Szepe
2003-07-26T19:47:58Z

$subj

patch against -bk3.

--
Tomas Szepe <szepe@pinerecords.com>

diff -urN a/arch/i386/kernel/cpu/cpufreq/Kconfig b/arch/i386/kernel/cpu/cpufreq/Kconfig
--- a/arch/i386/kernel/cpu/cpufreq/Kconfig 2003-07-10 23:30:33.000000000 +0200
+++ b/arch/i386/kernel/cpu/cpufreq/Kconfig 2003-07-26 21:37:13.000000000 +0200
@@ -2,10 +2,9 @@
# CPU Frequency scaling
#

-menu "CPU Frequency scaling"
-
config CPU_FREQ
bool "CPU Frequency scaling"
+ depends on PM
help
Clock scaling allows you to change the clock speed of CPUs on the
fly. This is a nice method to save battery power on notebooks,
@@ -16,6 +15,8 @@

If in doubt, say N.

+if CPU_FREQ
+
source "drivers/cpufreq/Kconfig"

config CPU_FREQ_TABLE
@@ -162,4 +163,4 @@

If in doubt, say N.

-endmenu
+endif
diff -urN a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
--- a/drivers/acpi/Kconfig 2003-06-22 22:27:39.000000000 +0200
+++ b/drivers/acpi/Kconfig 2003-07-26 21:34:05.000000000 +0200
@@ -2,7 +2,7 @@
# ACPI Configuration
#

-menu "ACPI Support"
+if PM

config ACPI
bool "ACPI Support" if X86
@@ -36,6 +36,8 @@
available at:
<http://www.acpi.info>

+if ACPI
+
config ACPI_HT_ONLY
bool "CPU Enumeration Only"
depends on X86 && ACPI && X86_LOCAL_APIC
@@ -236,5 +238,6 @@
depends on IA64 && (!IA64_HP_SIM || IA64_SGI_SN)
default y

-endmenu
+endif

+endif