diff options
Diffstat (limited to 'arch/arm/Kconfig')
-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 91cf27c40d25..c6b248d19c79 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig | |||
@@ -1005,9 +1005,9 @@ config ATAGS_PROC | |||
1005 | 1005 | ||
1006 | endmenu | 1006 | endmenu |
1007 | 1007 | ||
1008 | if (ARCH_SA1100 || ARCH_INTEGRATOR || ARCH_OMAP || ARCH_IMX || ARCH_PXA) | 1008 | menu "CPU Power Management" |
1009 | 1009 | ||
1010 | menu "CPU Frequency scaling" | 1010 | if (ARCH_SA1100 || ARCH_INTEGRATOR || ARCH_OMAP || ARCH_IMX || ARCH_PXA) |
1011 | 1011 | ||
1012 | source "drivers/cpufreq/Kconfig" | 1012 | source "drivers/cpufreq/Kconfig" |
1013 | 1013 | ||
@@ -1047,10 +1047,12 @@ config CPU_FREQ_PXA | |||
1047 | default y | 1047 | default y |
1048 | select CPU_FREQ_DEFAULT_GOV_USERSPACE | 1048 | select CPU_FREQ_DEFAULT_GOV_USERSPACE |
1049 | 1049 | ||
1050 | endmenu | ||
1051 | |||
1052 | endif | 1050 | endif |
1053 | 1051 | ||
1052 | source "drivers/cpuidle/Kconfig" | ||
1053 | |||
1054 | endmenu | ||
1055 | |||
1054 | menu "Floating point emulation" | 1056 | menu "Floating point emulation" |
1055 | 1057 | ||
1056 | comment "At least one emulation must be selected" | 1058 | comment "At least one emulation must be selected" |
@@ -1202,6 +1204,8 @@ source "drivers/power/Kconfig" | |||
1202 | 1204 | ||
1203 | source "drivers/hwmon/Kconfig" | 1205 | source "drivers/hwmon/Kconfig" |
1204 | 1206 | ||
1207 | source "drivers/thermal/Kconfig" | ||
1208 | |||
1205 | source "drivers/watchdog/Kconfig" | 1209 | source "drivers/watchdog/Kconfig" |
1206 | 1210 | ||
1207 | source "drivers/ssb/Kconfig" | 1211 | source "drivers/ssb/Kconfig" |
@@ -1222,6 +1226,10 @@ source "drivers/usb/Kconfig" | |||
1222 | 1226 | ||
1223 | source "drivers/mmc/Kconfig" | 1227 | source "drivers/mmc/Kconfig" |
1224 | 1228 | ||
1229 | source "drivers/memstick/Kconfig" | ||
1230 | |||
1231 | source "drivers/accessibility/Kconfig" | ||
1232 | |||
1225 | source "drivers/leds/Kconfig" | 1233 | source "drivers/leds/Kconfig" |
1226 | 1234 | ||
1227 | source "drivers/rtc/Kconfig" | 1235 | source "drivers/rtc/Kconfig" |
@@ -1230,6 +1238,8 @@ source "drivers/dma/Kconfig" | |||
1230 | 1238 | ||
1231 | source "drivers/dca/Kconfig" | 1239 | source "drivers/dca/Kconfig" |
1232 | 1240 | ||
1241 | source "drivers/auxdisplay/Kconfig" | ||
1242 | |||
1233 | source "drivers/regulator/Kconfig" | 1243 | source "drivers/regulator/Kconfig" |
1234 | 1244 | ||
1235 | source "drivers/uio/Kconfig" | 1245 | source "drivers/uio/Kconfig" |