diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2013-04-09 17:07:36 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2013-04-09 17:07:36 +0200 |
| commit | 1194b152cd4eff475652785ce366b20afe82dfcf (patch) | |
| tree | 78da3848410f05949714b2e475d4cf92b463fb31 /arch/arm/Kconfig | |
| parent | Merge tag 'omap-for-v3.10/gpmc-signed' of git://git.kernel.org/pub/scm/linux/... (diff) | |
| parent | ARM: tegra: pm: remove duplicated include from pm.c (diff) | |
| download | linux-1194b152cd4eff475652785ce366b20afe82dfcf.tar.xz linux-1194b152cd4eff475652785ce366b20afe82dfcf.zip | |
Merge branch 'tegra/soc' into next/drivers
This is a dependency for the tegra/clk branch.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Conflicts:
drivers/clocksource/tegra20_timer.c
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 eb91022b90ba..ada582b15cf2 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -673,6 +673,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 |