diff options
| author | Jon Ringle <jon.ringle@comdial.com> | 2005-10-28 11:19:37 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2005-10-28 11:19:37 -0400 |
| commit | 0b83f1400fa6e5f0d4afcff033628a16c163862a (patch) | |
| tree | c6fa01fd5a8d156b415ba9203f8ad349165de8ec /arch/arm/boot | |
| parent | b57235215933d5fde4013e2448223b934b4ac2b7 (diff) | |
[ARM] 2918/1: [update] Base port of Comdial MP1000 platfrom
Patch from Jon Ringle
Updated 2898/1 per comments:
- Removed fixup
- Moved code in mach-mp1000/ to mach-clps711x/
- Cleaned up code in mp1000-seprom.c. Eliminated code that displayed the contents of the eeprom
Please comment.
Signed-off-by: Jon Ringle
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/boot')
| -rw-r--r-- | arch/arm/boot/compressed/head.S | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/boot/compressed/head.S b/arch/arm/boot/compressed/head.S index 7c7f475e213e..a54d2eb64892 100644 --- a/arch/arm/boot/compressed/head.S +++ b/arch/arm/boot/compressed/head.S | |||
| @@ -39,7 +39,8 @@ | |||
| 39 | defined(CONFIG_ARCH_IXP4XX) || \ | 39 | defined(CONFIG_ARCH_IXP4XX) || \ |
| 40 | defined(CONFIG_ARCH_IXP2000) || \ | 40 | defined(CONFIG_ARCH_IXP2000) || \ |
| 41 | defined(CONFIG_ARCH_LH7A40X) || \ | 41 | defined(CONFIG_ARCH_LH7A40X) || \ |
| 42 | defined(CONFIG_ARCH_OMAP) | 42 | defined(CONFIG_ARCH_OMAP) || \ |
| 43 | defined(CONFIG_MACH_MP1000) | ||
| 43 | .macro loadsp, rb | 44 | .macro loadsp, rb |
| 44 | addruart \rb | 45 | addruart \rb |
| 45 | .endm | 46 | .endm |