diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-04-28 21:41:01 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-04-28 21:41:01 +0100 |
| commit | 10993374f84cc1c4100aea9eca7fa154518ffc5e (patch) | |
| tree | 0694a5c1119368b3bca4c17c5bc3a14a5bfa77e8 /arch/arm/Kconfig | |
| parent | a133e775d533c0035af627693dec288f1b1d4ffc (diff) | |
| parent | fc76132b1e72efe45b5a5a693caadd54c3037f55 (diff) | |
| download | blackbird-op-linux-10993374f84cc1c4100aea9eca7fa154518ffc5e.tar.gz blackbird-op-linux-10993374f84cc1c4100aea9eca7fa154518ffc5e.zip | |
Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6
Diffstat (limited to 'arch/arm/Kconfig')
| -rw-r--r-- | arch/arm/Kconfig | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index cfd99649ad85..99875dd06f50 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -486,8 +486,6 @@ config ARCH_PXA select HAVE_CLK select COMMON_CLKDEV select ARCH_REQUIRE_GPIOLIB - select HAVE_CLK - select COMMON_CLKDEV select GENERIC_TIME select GENERIC_CLOCKEVENTS select TICK_ONESHOT @@ -1173,12 +1171,6 @@ config CPU_FREQ_IMX If in doubt, say N. -config CPU_FREQ_PXA - bool - depends on CPU_FREQ && ARCH_PXA && PXA25x - default y - select CPU_FREQ_DEFAULT_GOV_USERSPACE - endif source "drivers/cpuidle/Kconfig" |
