diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-07-28 18:30:36 +1000 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-07-28 18:30:36 +1000 |
commit | c12204a860f471c064cdc9f7936e6b773324efab (patch) | |
tree | 34c7d24b0be315573221962398bd5c379d6cd813 /arch | |
parent | 02cdd537d2aa7c9c1b1ea476ec2943b751d3a22f (diff) | |
parent | 09575693a2511b5ddae0105546e0d9cefc936e34 (diff) |
Merge remote-tracking branch 'clk/clk-next'
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/mach-rockchip/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-rockchip/Kconfig b/arch/arm/mach-rockchip/Kconfig index 1caee6d548b8..e4564c259ed1 100644 --- a/arch/arm/mach-rockchip/Kconfig +++ b/arch/arm/mach-rockchip/Kconfig @@ -2,6 +2,7 @@ config ARCH_ROCKCHIP bool "Rockchip RK2928 and RK3xxx SOCs" if ARCH_MULTI_V7 select PINCTRL select PINCTRL_ROCKCHIP + select ARCH_HAS_RESET_CONTROLLER select ARCH_REQUIRE_GPIOLIB select ARM_GIC select CACHE_L2X0 |