diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-08-18 17:26:00 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-09-01 12:06:25 +0100 |
| commit | ac9d7efc7da0d88f9e7a1e0f532da35b7673098e (patch) | |
| tree | a7d1263aaa9767e40727b307293a811fdb3e4a92 /arch | |
| parent | d7ac4e28ccc63ed6b4d67bd9c4a67cb9533eeb45 (diff) | |
| download | linux-3.10-ac9d7efc7da0d88f9e7a1e0f532da35b7673098e.tar.gz linux-3.10-ac9d7efc7da0d88f9e7a1e0f532da35b7673098e.tar.bz2 linux-3.10-ac9d7efc7da0d88f9e7a1e0f532da35b7673098e.zip | |
[ARM] Update arch/arm/Kconfig for drivers/Kconfig changes, add cpuidle
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/Kconfig | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 91cf27c40d2..c6b248d19c7 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -1005,9 +1005,9 @@ config ATAGS_PROC endmenu -if (ARCH_SA1100 || ARCH_INTEGRATOR || ARCH_OMAP || ARCH_IMX || ARCH_PXA) +menu "CPU Power Management" -menu "CPU Frequency scaling" +if (ARCH_SA1100 || ARCH_INTEGRATOR || ARCH_OMAP || ARCH_IMX || ARCH_PXA) source "drivers/cpufreq/Kconfig" @@ -1047,10 +1047,12 @@ config CPU_FREQ_PXA default y select CPU_FREQ_DEFAULT_GOV_USERSPACE -endmenu - endif +source "drivers/cpuidle/Kconfig" + +endmenu + menu "Floating point emulation" comment "At least one emulation must be selected" @@ -1202,6 +1204,8 @@ source "drivers/power/Kconfig" source "drivers/hwmon/Kconfig" +source "drivers/thermal/Kconfig" + source "drivers/watchdog/Kconfig" source "drivers/ssb/Kconfig" @@ -1222,6 +1226,10 @@ source "drivers/usb/Kconfig" source "drivers/mmc/Kconfig" +source "drivers/memstick/Kconfig" + +source "drivers/accessibility/Kconfig" + source "drivers/leds/Kconfig" source "drivers/rtc/Kconfig" @@ -1230,6 +1238,8 @@ source "drivers/dma/Kconfig" source "drivers/dca/Kconfig" +source "drivers/auxdisplay/Kconfig" + source "drivers/regulator/Kconfig" source "drivers/uio/Kconfig" |