From b4676a25e2feb15826d960f4a216c3c429d2de75 Mon Sep 17 00:00:00 2001 From: wdenk Date: Sun, 7 Dec 2003 19:24:00 +0000 Subject: * 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 --- include/asm-arm/arch-pxa/hardware.h | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'include/asm-arm') 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" -- cgit v1.2.1