summaryrefslogtreecommitdiffstats
path: root/arch/arm/plat-s3c/include/plat/uncompress.h
diff options
context:
space:
mode:
authorBen Dooks <ben-linux@fluff.org>2008-12-18 14:52:04 +0000
committerBen Dooks <ben-linux@fluff.org>2008-12-18 14:52:04 +0000
commit7f2754378f3522a42daafdbb9d2385f341008454 (patch)
tree7a6223f270cdf53067a70c2e86b2190d3577c23d /arch/arm/plat-s3c/include/plat/uncompress.h
parentc6ad115876763e4f15055982ecb9579cb7abab5f (diff)
parenta9c5d23ac724a3b908833cafbbbd49abe4741b86 (diff)
downloadtalos-op-linux-7f2754378f3522a42daafdbb9d2385f341008454.tar.gz
talos-op-linux-7f2754378f3522a42daafdbb9d2385f341008454.zip
Merge branch 'next-s3c64xx' into next-merged
Diffstat (limited to 'arch/arm/plat-s3c/include/plat/uncompress.h')
-rw-r--r--arch/arm/plat-s3c/include/plat/uncompress.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/plat-s3c/include/plat/uncompress.h b/arch/arm/plat-s3c/include/plat/uncompress.h
index 2c39a309aeb0..6061de87f225 100644
--- a/arch/arm/plat-s3c/include/plat/uncompress.h
+++ b/arch/arm/plat-s3c/include/plat/uncompress.h
@@ -37,7 +37,7 @@ static void arch_detect_cpu(void);
/* how many bytes we allow into the FIFO at a time in FIFO mode */
#define FIFO_MAX (14)
-#define uart_base S3C24XX_PA_UART + (0x4000*CONFIG_S3C_LOWLEVEL_UART_PORT)
+#define uart_base S3C_PA_UART + (S3C_UART_OFFSET * CONFIG_S3C_LOWLEVEL_UART_PORT)
static __inline__ void
uart_wr(unsigned int reg, unsigned int val)
OpenPOWER on IntegriCloud