diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2013-04-08 18:42:16 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2013-04-08 18:42:16 +0200 |
| commit | c985d7e325fd5c2bf78de2f705f6001bce143a26 (patch) | |
| tree | 6580bc32fd6f27fbd6a486ac741d8f562271af6a /arch/arm/Kconfig | |
| parent | e382328a811fd6ffdb77ee16ff6a9e92e07561c5 (diff) | |
| parent | c7c28b0fdd06d8eb9414d21f8956b7c773ceea93 (diff) | |
| download | linux-c985d7e325fd5c2bf78de2f705f6001bce143a26.tar.gz linux-c985d7e325fd5c2bf78de2f705f6001bce143a26.tar.bz2 linux-c985d7e325fd5c2bf78de2f705f6001bce143a26.zip | |
Merge branch 'zynq/core-smp' of git://git.xilinx.com/linux-xlnx into next/soc2
From Michal Simek <michal.simek@xilinx.com>:
This branch is based on zynq/clksrc/cleanup parts because
there are some dependencies on moving timer to generic location.
I could based it on standard Linux tagged version but you will get
several conflicts you will have to resolve.
If you are OK to resolving these problems, please let me know
I will create another branch with core-smp changes which are not based
on zynq/clksrc/cleanup branch.
* 'zynq/core-smp' of git://git.xilinx.com/linux-xlnx:
arm: zynq: Add hotplug support
arm: zynq: Add smp support
arm: zynq: Add smp_twd timer
arm: zynq: Get rid of xilinx function prefix
arm: zynq: Add support for system reset
arm: zynq: Move slcr initialization to separate file
arm: zynq: Load scu baseaddress at run time
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/Kconfig')
| -rw-r--r-- | arch/arm/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 9866b82a4ece..11680092e407 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -1593,6 +1593,7 @@ config HAVE_ARM_ARCH_TIMER config HAVE_ARM_TWD bool depends on SMP + select CLKSRC_OF if OF help This options enables support for the ARM timer and watchdog unit |