diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-04-28 16:41:01 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-04-28 16:41:01 -0400 |
| commit | 10993374f84cc1c4100aea9eca7fa154518ffc5e (patch) | |
| tree | 0694a5c1119368b3bca4c17c5bc3a14a5bfa77e8 /arch/arm/Kconfig | |
| parent | a133e775d533c0035af627693dec288f1b1d4ffc (diff) | |
| parent | fc76132b1e72efe45b5a5a693caadd54c3037f55 (diff) | |
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 | |||
| 486 | select HAVE_CLK | 486 | select HAVE_CLK |
| 487 | select COMMON_CLKDEV | 487 | select COMMON_CLKDEV |
| 488 | select ARCH_REQUIRE_GPIOLIB | 488 | select ARCH_REQUIRE_GPIOLIB |
| 489 | select HAVE_CLK | ||
| 490 | select COMMON_CLKDEV | ||
| 491 | select GENERIC_TIME | 489 | select GENERIC_TIME |
| 492 | select GENERIC_CLOCKEVENTS | 490 | select GENERIC_CLOCKEVENTS |
| 493 | select TICK_ONESHOT | 491 | select TICK_ONESHOT |
| @@ -1173,12 +1171,6 @@ config CPU_FREQ_IMX | |||
| 1173 | 1171 | ||
| 1174 | If in doubt, say N. | 1172 | If in doubt, say N. |
| 1175 | 1173 | ||
| 1176 | config CPU_FREQ_PXA | ||
| 1177 | bool | ||
| 1178 | depends on CPU_FREQ && ARCH_PXA && PXA25x | ||
| 1179 | default y | ||
| 1180 | select CPU_FREQ_DEFAULT_GOV_USERSPACE | ||
| 1181 | |||
| 1182 | endif | 1174 | endif |
| 1183 | 1175 | ||
| 1184 | source "drivers/cpuidle/Kconfig" | 1176 | source "drivers/cpuidle/Kconfig" |