Skip to content

Commit ac9d7ef

Browse files
Russell KingRussell King
authored andcommitted
[ARM] Update arch/arm/Kconfig for drivers/Kconfig changes, add cpuidle
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
1 parent d7ac4e2 commit ac9d7ef

File tree

1 file changed

+14
-4
lines changed

1 file changed

+14
-4
lines changed

arch/arm/Kconfig

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1005,9 +1005,9 @@ config ATAGS_PROC
10051005

10061006
endmenu
10071007

1008-
if (ARCH_SA1100 || ARCH_INTEGRATOR || ARCH_OMAP || ARCH_IMX || ARCH_PXA)
1008+
menu "CPU Power Management"
10091009

1010-
menu "CPU Frequency scaling"
1010+
if (ARCH_SA1100 || ARCH_INTEGRATOR || ARCH_OMAP || ARCH_IMX || ARCH_PXA)
10111011

10121012
source "drivers/cpufreq/Kconfig"
10131013

@@ -1047,10 +1047,12 @@ config CPU_FREQ_PXA
10471047
default y
10481048
select CPU_FREQ_DEFAULT_GOV_USERSPACE
10491049

1050-
endmenu
1051-
10521050
endif
10531051

1052+
source "drivers/cpuidle/Kconfig"
1053+
1054+
endmenu
1055+
10541056
menu "Floating point emulation"
10551057

10561058
comment "At least one emulation must be selected"
@@ -1202,6 +1204,8 @@ source "drivers/power/Kconfig"
12021204

12031205
source "drivers/hwmon/Kconfig"
12041206

1207+
source "drivers/thermal/Kconfig"
1208+
12051209
source "drivers/watchdog/Kconfig"
12061210

12071211
source "drivers/ssb/Kconfig"
@@ -1222,6 +1226,10 @@ source "drivers/usb/Kconfig"
12221226

12231227
source "drivers/mmc/Kconfig"
12241228

1229+
source "drivers/memstick/Kconfig"
1230+
1231+
source "drivers/accessibility/Kconfig"
1232+
12251233
source "drivers/leds/Kconfig"
12261234

12271235
source "drivers/rtc/Kconfig"
@@ -1230,6 +1238,8 @@ source "drivers/dma/Kconfig"
12301238

12311239
source "drivers/dca/Kconfig"
12321240

1241+
source "drivers/auxdisplay/Kconfig"
1242+
12331243
source "drivers/regulator/Kconfig"
12341244

12351245
source "drivers/uio/Kconfig"

0 commit comments

Comments
 (0)