summaryrefslogtreecommitdiff
path: root/include/asm-arm/arch-kirkwood/kirkwood.h
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2009-07-13 23:45:02 +0200
committerWolfgang Denk <wd@denx.de>2009-07-13 23:45:02 +0200
commitc3ae126c2cad03f04be36c92dd9437b9ee2385b6 (patch)
treec10c50a9f5369cc8d955869ed4b8e34ffe14969a /include/asm-arm/arch-kirkwood/kirkwood.h
parent227ad917c5510f595bed29c996a3411b50118959 (diff)
parent986922714ffd21ad39f48522d285fffc7aed56b1 (diff)
downloadu-boot-imx-c3ae126c2cad03f04be36c92dd9437b9ee2385b6.zip
u-boot-imx-c3ae126c2cad03f04be36c92dd9437b9ee2385b6.tar.gz
u-boot-imx-c3ae126c2cad03f04be36c92dd9437b9ee2385b6.tar.bz2
Merge branch 'master' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'include/asm-arm/arch-kirkwood/kirkwood.h')
-rw-r--r--include/asm-arm/arch-kirkwood/kirkwood.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-arm/arch-kirkwood/kirkwood.h b/include/asm-arm/arch-kirkwood/kirkwood.h
index 52dafc2..47679dd 100644
--- a/include/asm-arm/arch-kirkwood/kirkwood.h
+++ b/include/asm-arm/arch-kirkwood/kirkwood.h
@@ -45,7 +45,7 @@
#define KW_REG_UNDOC_0x1478 (KW_REGISTER(0x1478))
#define KW_UART0_BASE (KW_REGISTER(0x12000))
-#define KW_UART1_BASE (KW_REGISTER(0x13000))
+#define KW_UART1_BASE (KW_REGISTER(0x12100))
#define KW_MPP_BASE (KW_REGISTER(0x10000))
#define KW_GPIO0_BASE (KW_REGISTER(0x10100))
#define KW_GPIO1_BASE (KW_REGISTER(0x10140))