diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-09-09 17:38:43 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-09-09 17:38:43 -0400 |
| commit | de9ea203d105f760e8e995c07aa80e855a9aedba (patch) | |
| tree | 75e4702e98a0b3ea9ed6d085f74474a70642909b /arch/arm/Kconfig | |
| parent | 2be23c475af8ae4e25f8bab08d815b17593bd547 (diff) | |
| parent | d56557af19867edb8c0e96f8e26399698a08857f (diff) | |
Merge branch 'origin'
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 a7ed21f0136..16bc8eb4901 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 |