diff options
| author | wdenk <wdenk> | 2003-12-07 19:24:00 +0000 |
|---|---|---|
| committer | wdenk <wdenk> | 2003-12-07 19:24:00 +0000 |
| commit | b4676a25e2feb15826d960f4a216c3c429d2de75 (patch) | |
| tree | 884c5a34f6f0769ddafc939b76a6633425d84372 /include/asm-arm | |
| parent | a2663ea4fc9d18cb8000c97ed92c3c668eda8e04 (diff) | |
| download | blackbird-obmc-uboot-b4676a25e2feb15826d960f4a216c3c429d2de75.tar.gz blackbird-obmc-uboot-b4676a25e2feb15826d960f4a216c3c429d2de75.zip | |
* Patch by Andre Schwarz, 24 Nov 2003:
add support for mvblue (mvBlueLYNX and mvBlueBOX) boards
* Patch by Pavel Bartusek, 21 Nov 2003:
set ZMII bridge speed on 440
* Patch by Anders Larsen, 17 Nov 2003:
Fix mismatched #ifdef / #endif in include/asm-arm/arch-pxa/hardware.h
Diffstat (limited to 'include/asm-arm')
| -rw-r--r-- | include/asm-arm/arch-pxa/hardware.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/include/asm-arm/arch-pxa/hardware.h b/include/asm-arm/arch-pxa/hardware.h index d40f05ed4d..a76a0290a1 100644 --- a/include/asm-arm/arch-pxa/hardware.h +++ b/include/asm-arm/arch-pxa/hardware.h @@ -84,10 +84,6 @@ typedef struct { volatile u32 offset[4096]; } __regbase; # define __REG(x) io_p2v(x) # define __PREG(x) io_v2p(x) -#endif -#endif /* UBOOT_REG_FIX */ - -#ifdef UBOOT_REG_FIX # undef io_p2v # undef __REG # ifndef __ASSEMBLY__ @@ -96,6 +92,7 @@ typedef struct { volatile u32 offset[4096]; } __regbase; # define __REG2(x,y) (*(volatile u32 *)((u32)&__REG(x) + (y))) # else # define __REG(x) (x) +# endif #endif /* UBOOT_REG_FIX */ #include "pxa-regs.h" |
