Skip to content

Commit

Permalink
[ARM] Update arch/arm/Kconfig for drivers/Kconfig changes, add cpuidle
Browse files Browse the repository at this point in the history
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
  • Loading branch information
Russell King authored and Russell King committed Sep 1, 2008
1 parent d7ac4e2 commit ac9d7ef
Showing 1 changed file with 14 additions and 4 deletions.
18 changes: 14 additions & 4 deletions arch/arm/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -1202,6 +1204,8 @@ source "drivers/power/Kconfig"

source "drivers/hwmon/Kconfig"

source "drivers/thermal/Kconfig"

source "drivers/watchdog/Kconfig"

source "drivers/ssb/Kconfig"
Expand All @@ -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"
Expand All @@ -1230,6 +1238,8 @@ source "drivers/dma/Kconfig"

source "drivers/dca/Kconfig"

source "drivers/auxdisplay/Kconfig"

source "drivers/regulator/Kconfig"

source "drivers/uio/Kconfig"
Expand Down

0 comments on commit ac9d7ef

Please sign in to comment.