diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2013-04-09 11:07:36 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2013-04-09 11:07:36 -0400 |
| commit | 1194b152cd4eff475652785ce366b20afe82dfcf (patch) | |
| tree | 78da3848410f05949714b2e475d4cf92b463fb31 /arch/arm/Kconfig | |
| parent | 86feb64f5bfe75da74f4a2faf18b5e57be9cde5e (diff) | |
| parent | 38be85de698ef3f2755ee0eabf520530757860aa (diff) | |
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 | |||
| 673 | select HAVE_CLK | 673 | select HAVE_CLK |
| 674 | select HAVE_SMP | 674 | select HAVE_SMP |
| 675 | select MIGHT_HAVE_CACHE_L2X0 | 675 | select MIGHT_HAVE_CACHE_L2X0 |
| 676 | select SOC_BUS | ||
| 676 | select SPARSE_IRQ | 677 | select SPARSE_IRQ |
| 677 | select USE_OF | 678 | select USE_OF |
| 678 | help | 679 | help |