| commit | 98e52c373cdc1239a9ec6a2763f519cc1d99dcbc | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Tue Sep 07 14:48:44 2010 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Tue Sep 07 14:48:44 2010 -0700 |
| tree | c668453e4b4f430e54cb34819d6e840b56243085 | |
| parent | add2b10f2ba15ac231181306c975e58d26f9bd54 [diff] | |
| parent | a9d8fb4d09ec8823045f44ebcde53a563fce2feb [diff] |
Merge branch 'for-linus' of git://android.kernel.org/kernel/tegra * 'for-linus' of git://android.kernel.org/kernel/tegra: [ARM] tegra: Add ZRELADDR default for ARCH_TEGRA
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index a7ed21f..16bc8eb 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig
@@ -1601,6 +1601,7 @@ ARCH_ORION5X ||\ ARCH_SPEAR3XX ||\ ARCH_SPEAR6XX ||\ + ARCH_TEGRA ||\ ARCH_U8500 ||\ ARCH_VERSATILE ||\ ARCH_W90X900