diff options
| author | David S. Miller <davem@davemloft.net> | 2013-05-04 18:34:13 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-05-04 18:34:13 -0700 |
| commit | 048c9acca90ca7da42b92745445fe008a48add88 (patch) | |
| tree | e2e551a565a7dcdca0fc398aa659231745e5a901 /arch/arm/mach-zynq/Kconfig | |
| parent | 07df841877195765d958df146f614fc7bdedd5e3 (diff) | |
| parent | ad348cc5349be4ef4abe08819afbb63386585413 (diff) | |
| download | op-kernel-dev-048c9acca90ca7da42b92745445fe008a48add88.zip op-kernel-dev-048c9acca90ca7da42b92745445fe008a48add88.tar.gz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc
Merge sparc bug fixes that didn't make it into v3.9 into
sparc-next.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/arm/mach-zynq/Kconfig')
| -rw-r--r-- | arch/arm/mach-zynq/Kconfig | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mach-zynq/Kconfig b/arch/arm/mach-zynq/Kconfig index adb6c0e..cf3226b 100644 --- a/arch/arm/mach-zynq/Kconfig +++ b/arch/arm/mach-zynq/Kconfig @@ -5,9 +5,12 @@ config ARCH_ZYNQ select COMMON_CLK select CPU_V7 select GENERIC_CLOCKEVENTS + select HAVE_ARM_SCU if SMP + select HAVE_ARM_TWD if LOCAL_TIMERS select ICST select MIGHT_HAVE_CACHE_L2X0 select USE_OF select SPARSE_IRQ + select CADENCE_TTC_TIMER help Support for Xilinx Zynq ARM Cortex A9 Platform |
