Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ac9d7efc authored by Russell King's avatar Russell King Committed by Russell King
Browse files

[ARM] Update arch/arm/Kconfig for drivers/Kconfig changes, add cpuidle

parent d7ac4e28
Loading
Loading
Loading
Loading
+14 −4
Original line number Original line Diff line number Diff line
@@ -1005,9 +1005,9 @@ config ATAGS_PROC


endmenu
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"
source "drivers/cpufreq/Kconfig"


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


endmenu

endif
endif


source "drivers/cpuidle/Kconfig"

endmenu

menu "Floating point emulation"
menu "Floating point emulation"


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


source "drivers/hwmon/Kconfig"
source "drivers/hwmon/Kconfig"


source "drivers/thermal/Kconfig"

source "drivers/watchdog/Kconfig"
source "drivers/watchdog/Kconfig"


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


source "drivers/mmc/Kconfig"
source "drivers/mmc/Kconfig"


source "drivers/memstick/Kconfig"

source "drivers/accessibility/Kconfig"

source "drivers/leds/Kconfig"
source "drivers/leds/Kconfig"


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


source "drivers/dca/Kconfig"
source "drivers/dca/Kconfig"


source "drivers/auxdisplay/Kconfig"

source "drivers/regulator/Kconfig"
source "drivers/regulator/Kconfig"


source "drivers/uio/Kconfig"
source "drivers/uio/Kconfig"