diff options
| author | Lars-Peter Clausen <lars@metafoo.de> | 2009-11-05 23:10:05 +0100 |
|---|---|---|
| committer | Lars-Peter Clausen <lars@metafoo.de> | 2009-11-05 23:10:05 +0100 |
| commit | 1120425e03c4fa7b0397b9b1b8e24e17a4971da2 (patch) | |
| tree | 37e4cf6e55f67620212e093e9f81b57d23337c34 /arch/arm/boot/compressed/head.S | |
| parent | cf571486db84b827669345fb0d6b4f2f1e413a04 (diff) | |
| parent | e0589bf83d9cb9afd87be5c8404381892b6fdc30 (diff) | |
Merge branch 'om-s3c-2.6.31' into om-2.6.31
Diffstat (limited to 'arch/arm/boot/compressed/head.S')
| -rw-r--r-- | arch/arm/boot/compressed/head.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/compressed/head.S b/arch/arm/boot/compressed/head.S index 4515728c534..858feeacd05 100644 --- a/arch/arm/boot/compressed/head.S +++ b/arch/arm/boot/compressed/head.S @@ -58,7 +58,7 @@ add \rb, \rb, #0x00010000 @ Ser1 #endif .endm -#elif defined(CONFIG_ARCH_S3C2410) +#elif defined(CONFIG_ARCH_S3C2410) && CONFIG_S3C_LOWLEVEL_UART_PORT >= 0 .macro loadsp, rb mov \rb, #0x50000000 add \rb, \rb, #0x4000 * CONFIG_S3C_LOWLEVEL_UART_PORT |