diff options
| author | Paul Mackerras <paulus@samba.org> | 2005-10-30 21:37:12 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-10-30 21:37:12 -0500 |
| commit | 23fd07750a789a66fe88cf173d52a18f1a387da4 (patch) | |
| tree | 06fdd6df35fdb835abdaa9b754d62f6b84b97250 /arch/arm/boot/compressed/head.S | |
| parent | bd787d438a59266af3c9f6351644c85ef1dd21fe (diff) | |
| parent | ed28f96ac1960f30f818374d65be71d2fdf811b0 (diff) | |
Merge ../linux-2.6 by hand
Diffstat (limited to 'arch/arm/boot/compressed/head.S')
| -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 |