diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2013-04-09 16:54:27 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2013-04-09 16:54:27 +0200 |
| commit | 3afeb0a046af159f0ff97a20cf6ebc44d0d2bd64 (patch) | |
| tree | 49bbe7b27f8571c7716e9cbc7fbbe462ea82077a /arch/arm/Kconfig | |
| parent | d93bea007ab3d77b796eb99fb4ff4eeb013e0dfa (diff) | |
| parent | 38be85de698ef3f2755ee0eabf520530757860aa (diff) | |
Merge branch 'tegra/soc' into next/multiplatform
This is a dependency for the tegra multiplatform series.
Conflicts:
drivers/clocksource/tegra20_timer.c
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 65aa5ef1773..6584941e0fa 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -612,6 +612,7 @@ config ARCH_TEGRA select HAVE_CLK select HAVE_SMP select MIGHT_HAVE_CACHE_L2X0 + select SOC_BUS select SPARSE_IRQ select USE_OF help |