diff options
| author | Greg KH <greg@press.(none)> | 2005-10-28 13:13:16 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2005-10-28 13:13:16 -0400 |
| commit | 6fbfddcb52d8d9fa2cd209f5ac2a1c87497d55b5 (patch) | |
| tree | c0414e89678fcef7ce3493e048d855bde781ae8d /arch/arm/boot | |
| parent | 1a222bca26ca691e83be1b08f5e96ae96d0d8cae (diff) | |
| parent | 27d1097d39509494706eaa2620ef3b1e780a3224 (diff) | |
Merge ../bleed-2.6
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 |