diff options
author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-26 17:28:24 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-26 17:28:24 -0700 |
commit | 41b6c37326cb24efc86fba94bcaa37f2cc23f1cd (patch) | |
tree | e8a8be21d4eb613d65c1f6dfc125157c2568b86f /include/asm-arm/arch-ixp2000/ixdp2x01.h | |
parent | 5f6b5517bfcae217d52a7607b1bebc3a257f45d1 (diff) | |
parent | 26799e675e47c5aa3104628e2081a7299ea46557 (diff) |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Diffstat (limited to 'include/asm-arm/arch-ixp2000/ixdp2x01.h')
-rw-r--r-- | include/asm-arm/arch-ixp2000/ixdp2x01.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-arm/arch-ixp2000/ixdp2x01.h b/include/asm-arm/arch-ixp2000/ixdp2x01.h index b3a1bcda8d0..b768009c3a5 100644 --- a/include/asm-arm/arch-ixp2000/ixdp2x01.h +++ b/include/asm-arm/arch-ixp2000/ixdp2x01.h @@ -18,8 +18,8 @@ #define __IXDP2X01_H__ #define IXDP2X01_PHYS_CPLD_BASE 0xc6024000 -#define IXDP2X01_VIRT_CPLD_BASE 0xfafff000 -#define IXDP2X01_CPLD_REGION_SIZE 0x00001000 +#define IXDP2X01_VIRT_CPLD_BASE 0xfe000000 +#define IXDP2X01_CPLD_REGION_SIZE 0x00100000 #define IXDP2X01_CPLD_VIRT_REG(reg) (volatile unsigned long*)(IXDP2X01_VIRT_CPLD_BASE | reg) #define IXDP2X01_CPLD_PHYS_REG(reg) (volatile u32*)(IXDP2X01_PHYS_CPLD_BASE | reg) |