diff options
| author | Wolfgang Denk <wd@denx.de> | 2009-07-14 00:00:04 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2009-07-14 00:00:04 +0200 |
| commit | 87abce6e91b668390d07b578100d4053283a67e8 (patch) | |
| tree | 230c7bad063d766fc9cbd34ab89bce338a811739 /include/asm-arm/arch-kirkwood | |
| parent | c9969947a4687de90e2bb58e76842b491aa0e0b9 (diff) | |
| parent | bb272ec8df6e35b7e19ce1237cae28798167a624 (diff) | |
| download | u-boot-imx-87abce6e91b668390d07b578100d4053283a67e8.zip u-boot-imx-87abce6e91b668390d07b578100d4053283a67e8.tar.gz u-boot-imx-87abce6e91b668390d07b578100d4053283a67e8.tar.bz2 | |
Merge branch 'master' of /home/wd/git/u-boot/master
Diffstat (limited to 'include/asm-arm/arch-kirkwood')
| -rw-r--r-- | include/asm-arm/arch-kirkwood/kirkwood.h | 2 |
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)) |