diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-09-07 17:48:44 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-09-07 17:48:44 -0400 |
| commit | 98e52c373cdc1239a9ec6a2763f519cc1d99dcbc (patch) | |
| tree | c668453e4b4f430e54cb34819d6e840b56243085 /arch | |
| 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
Diffstat (limited to 'arch')
| -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 a7ed21f0136a..16bc8eb4901c 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig | |||
| @@ -1601,6 +1601,7 @@ config ZRELADDR | |||
| 1601 | ARCH_ORION5X ||\ | 1601 | ARCH_ORION5X ||\ |
| 1602 | ARCH_SPEAR3XX ||\ | 1602 | ARCH_SPEAR3XX ||\ |
| 1603 | ARCH_SPEAR6XX ||\ | 1603 | ARCH_SPEAR6XX ||\ |
| 1604 | ARCH_TEGRA ||\ | ||
| 1604 | ARCH_U8500 ||\ | 1605 | ARCH_U8500 ||\ |
| 1605 | ARCH_VERSATILE ||\ | 1606 | ARCH_VERSATILE ||\ |
| 1606 | ARCH_W90X900 | 1607 | ARCH_W90X900 |