git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
mach-rockchip
/
Kconfig
diff --git
a/arch/arm/mach-rockchip/Kconfig
b/arch/arm/mach-rockchip/Kconfig
index d1686696ca41d00b3292d1d0bc70a7327acd73df..ac5803cac98d1d0c9f23562a711b3b6f16db6374 100644
(file)
--- a/
arch/arm/mach-rockchip/Kconfig
+++ b/
arch/arm/mach-rockchip/Kconfig
@@
-4,6
+4,7
@@
config ARCH_ROCKCHIP
select PINCTRL_ROCKCHIP
select ARCH_HAS_RESET_CONTROLLER
select ARCH_REQUIRE_GPIOLIB
+ select ARM_AMBA
select ARM_GIC
select CACHE_L2X0
select HAVE_ARM_ARCH_TIMER