summaryrefslogtreecommitdiff
path: root/arch/arm/mach-socfpga/Kconfig
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2013-06-21 13:46:56 +0400
committerArnd Bergmann <arnd@arndb.de>2013-06-21 13:46:56 +0400
commitc20e459fcc7d5d86a359b19f54362fb6fb77c6aa (patch)
tree67874c7e922932af6f25793775d0ca781b2697c2 /arch/arm/mach-socfpga/Kconfig
parente43995ad58264f5113a27d4c6c75edadcf126840 (diff)
parentd63dc0514d56e108cc96e334ca26b538263e52a2 (diff)
downloadlinux-c20e459fcc7d5d86a359b19f54362fb6fb77c6aa.tar.xz
Merge tag 'v3.11-rockchip-basics' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into next/soc
From Heiko Stuebner: Adds basic support for Rockchip Cortex-A9 SoCs. * tag 'v3.11-rockchip-basics' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip: arm: add basic support for Rockchip RK3066a boards arm: add debug uarts for rockchip rk29xx and rk3xxx series arm: Add basic clocks for Rockchip rk3066a SoCs clocksource: dw_apb_timer_of: use clocksource_of_init clocksource: dw_apb_timer_of: select DW_APB_TIMER clocksource: dw_apb_timer_of: add clock-handling clocksource: dw_apb_timer_of: enable the use the clocksource as sched clock Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-socfpga/Kconfig')
-rw-r--r--arch/arm/mach-socfpga/Kconfig1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-socfpga/Kconfig b/arch/arm/mach-socfpga/Kconfig
index 07dff6f18417..dd86db467521 100644
--- a/arch/arm/mach-socfpga/Kconfig
+++ b/arch/arm/mach-socfpga/Kconfig
@@ -7,7 +7,6 @@ config ARCH_SOCFPGA
select CLKDEV_LOOKUP
select COMMON_CLK
select CPU_V7
- select DW_APB_TIMER
select DW_APB_TIMER_OF
select GENERIC_CLOCKEVENTS
select GPIO_PL061 if GPIOLIB