X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;ds=sidebyside;f=include%2Fasm-arm%2Farch-pxa%2Fhardware.h;h=c8c479a186923d78f057d9a0d8a6089009a1b4e8;hb=4af34177b657e91263919a307fd0b0865a299e52;hp=b84ea48df1a4769458089e75127f73bcf25d99ce;hpb=4c3b21a5f915988e3d9681cf9cb566bb7bd56859;p=oweals%2Fu-boot.git

diff --git a/include/asm-arm/arch-pxa/hardware.h b/include/asm-arm/arch-pxa/hardware.h
index b84ea48df1..c8c479a186 100644
--- a/include/asm-arm/arch-pxa/hardware.h
+++ b/include/asm-arm/arch-pxa/hardware.h
@@ -4,7 +4,7 @@
  *  Author:	Nicolas Pitre
  *  Created:	Jun 15, 2001
  *  Copyright:	MontaVista Software Inc.
- *  
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
  * published by the Free Software Foundation.
@@ -84,18 +84,19 @@ 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 io_p2v
 # undef __REG
 # ifndef __ASSEMBLY__
-#  define io_p2v(PhAdd)    (PhAdd)
+#  define io_p2v(PhAdd)	   (PhAdd)
 #  define __REG(x)	(*((volatile u32 *)io_p2v(x)))
-#  define __REG2(x,y)	(*(volatile u32 *)((u32)&__REG(x) + (y)))	
+#  define __REG2(x,y)	(*(volatile u32 *)((u32)&__REG(x) + (y)))
 # else
-#  define __REG(x) (x)	
+#  define __REG(x) (x)
+#  ifdef CONFIG_CPU_MONAHANS /* Hack to make this work with mona's pxa-regs.h */
+#   define __REG_2(x) (x)
+#   define __REG_3(x) (x)
+#  endif
+# endif
 #endif /* UBOOT_REG_FIX */
 
 #include "pxa-regs.h"
@@ -108,9 +109,9 @@ typedef struct { volatile u32 offset[4096]; } __regbase;
  * This must be called *before* the corresponding IRQ is registered.
  * Use this instead of directly setting GRER/GFER.
  */
-#define GPIO_FALLING_EDGE       1
-#define GPIO_RISING_EDGE        2
-#define GPIO_BOTH_EDGES         3
+#define GPIO_FALLING_EDGE	1
+#define GPIO_RISING_EDGE	2
+#define GPIO_BOTH_EDGES		3
 extern void set_GPIO_IRQ_edge( int gpio_nr, int edge_mask );
 
 /*
@@ -150,4 +151,8 @@ extern unsigned int get_lclk_frequency_10khz(void);
 #include "innokom.h"
 #endif
 
-#endif  /* _ASM_ARCH_HARDWARE_H */
+#ifdef CONFIG_ARCH_PLEB
+#include "pleb.h"
+#endif
+
+#endif	/* _ASM_ARCH_HARDWARE_H */