aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/arm/Kconfig18
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
1006endmenu 1006endmenu
1007 1007
1008if (ARCH_SA1100 || ARCH_INTEGRATOR || ARCH_OMAP || ARCH_IMX || ARCH_PXA) 1008menu "CPU Power Management"
1009 1009
1010menu "CPU Frequency scaling" 1010if (ARCH_SA1100 || ARCH_INTEGRATOR || ARCH_OMAP || ARCH_IMX || ARCH_PXA)
1011 1011
1012source "drivers/cpufreq/Kconfig" 1012source "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
1050endmenu
1051
1052endif 1050endif
1053 1051
1052source "drivers/cpuidle/Kconfig"
1053
1054endmenu
1055
1054menu "Floating point emulation" 1056menu "Floating point emulation"
1055 1057
1056comment "At least one emulation must be selected" 1058comment "At least one emulation must be selected"
@@ -1202,6 +1204,8 @@ source "drivers/power/Kconfig"
1202 1204
1203source "drivers/hwmon/Kconfig" 1205source "drivers/hwmon/Kconfig"
1204 1206
1207source "drivers/thermal/Kconfig"
1208
1205source "drivers/watchdog/Kconfig" 1209source "drivers/watchdog/Kconfig"
1206 1210
1207source "drivers/ssb/Kconfig" 1211source "drivers/ssb/Kconfig"
@@ -1222,6 +1226,10 @@ source "drivers/usb/Kconfig"
1222 1226
1223source "drivers/mmc/Kconfig" 1227source "drivers/mmc/Kconfig"
1224 1228
1229source "drivers/memstick/Kconfig"
1230
1231source "drivers/accessibility/Kconfig"
1232
1225source "drivers/leds/Kconfig" 1233source "drivers/leds/Kconfig"
1226 1234
1227source "drivers/rtc/Kconfig" 1235source "drivers/rtc/Kconfig"
@@ -1230,6 +1238,8 @@ source "drivers/dma/Kconfig"
1230 1238
1231source "drivers/dca/Kconfig" 1239source "drivers/dca/Kconfig"
1232 1240
1241source "drivers/auxdisplay/Kconfig"
1242
1233source "drivers/regulator/Kconfig" 1243source "drivers/regulator/Kconfig"
1234 1244
1235source "drivers/uio/Kconfig" 1245source "drivers/uio/Kconfig"