aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/Kconfig
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2012-11-16 11:47:11 -0500
committerArnd Bergmann <arnd@arndb.de>2012-11-16 11:47:11 -0500
commit8ec1c811722b940c09961edd20bffb9eda1027c3 (patch)
tree7ea265830276e1b8dd658519d093692f05359f8e /arch/arm/Kconfig
parentbac2f668864eca45b702ee394bef4c5f3a86658c (diff)
parent91dc985c5e51af7036c1ccf9cea1b05662c96791 (diff)
Merge branch 'arm-next' of git://git.xilinx.com/linux-xlnx into next/dt
From Michal Simek <michal.simek@xilinx.com>: These are based on previous patches (arm-soc zynq/cleanup branch). The branch is still based on rc3 but I have also tried to merged it with the v3.7-rc5 and there is no issue. * 'arm-next' of git://git.xilinx.com/linux-xlnx: ARM: zynq: add clk binding support to the ttc ARM: zynq: use zynq clk bindings clk: Add support for fundamental zynq clks ARM: zynq: dts: split up device tree ARM: zynq: Allow UART1 to be used as DEBUG_LL console. ARM: zynq: dts: add description of the second uart ARM: zynq: move arm-specific sys_timer out of ttc zynq: move static peripheral mappings zynq: remove use of CLKDEV_LOOKUP zynq: use pl310 device tree bindings zynq: use GIC device tree bindings Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/Kconfig')
-rw-r--r--arch/arm/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index d33dc606f7ec..23252783e93f 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -945,7 +945,7 @@ config ARCH_ZYNQ
945 bool "Xilinx Zynq ARM Cortex A9 Platform" 945 bool "Xilinx Zynq ARM Cortex A9 Platform"
946 select ARM_AMBA 946 select ARM_AMBA
947 select ARM_GIC 947 select ARM_GIC
948 select CLKDEV_LOOKUP 948 select COMMON_CLK
949 select CPU_V7 949 select CPU_V7
950 select GENERIC_CLOCKEVENTS 950 select GENERIC_CLOCKEVENTS
951 select ICST 951 select ICST