diff options
author | Tom Rini <trini@ti.com> | 2013-01-11 14:38:24 -0700 |
---|---|---|
committer | Tom Rini <trini@ti.com> | 2013-01-11 14:38:24 -0700 |
commit | 7a8e739cd5bc0c48511d343f469af89a88a3294d (patch) | |
tree | 2198c265cd9d83d58b42ab8a8e66c2fff4d4545a /arch/arm/include/asm/arch-kirkwood/cpu.h | |
parent | 6fb4d74e59750b43f00d460c569e8a30c67c5bb0 (diff) | |
parent | 59ee45ee91cc91b392a8e2684bfcb8c933ce4967 (diff) |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'arch/arm/include/asm/arch-kirkwood/cpu.h')
-rw-r--r-- | arch/arm/include/asm/arch-kirkwood/cpu.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/include/asm/arch-kirkwood/cpu.h b/arch/arm/include/asm/arch-kirkwood/cpu.h index 57bfe8e78..009a6bb8f 100644 --- a/arch/arm/include/asm/arch-kirkwood/cpu.h +++ b/arch/arm/include/asm/arch-kirkwood/cpu.h @@ -33,7 +33,7 @@ | (attr << 8) | (kw_winctrl_calcsize(size) << 16)) #define KWGBE_PORT_SERIAL_CONTROL1_REG(_x) \ - ((_x ? KW_EGIGA0_BASE : KW_EGIGA1_BASE) + 0x44c) + ((_x ? KW_EGIGA1_BASE : KW_EGIGA0_BASE) + 0x44c) #define KW_REG_PCIE_DEVID (KW_REG_PCIE_BASE + 0x00) #define KW_REG_PCIE_REVID (KW_REG_PCIE_BASE + 0x08) |