Merge with /home/wd/git/u-boot/master

[platform/kernel/u-boot.git] / include / asm-arm / arch-pxa / pxa-regs.h

diff --git a/include/asm-arm/arch-pxa/pxa-regs.h b/include/asm-arm/arch-pxa/pxa-regs.h
index 5d36b84..83ae5e3 100644 (file)
--- a/include/asm-arm/arch-pxa/pxa-regs.h
+++ b/include/asm-arm/arch-pxa/pxa-regs.h
@@ -1009,7 +1009,7 @@ typedef void              (*ExcpHndlr) (void) ;
  *    - GPIO
  *    - Data Flash DF_* pins defined.
  */
-#define GPIO0          __REG(0x40e10124) 
+#define GPIO0          __REG(0x40e10124)
 #define GPIO1          __REG(0x40e10128)
 #define GPIO2          __REG(0x40e1012c)
 #define GPIO3          __REG(0x40e10130)
@@ -2058,8 +2058,6 @@ typedef void              (*ExcpHndlr) (void) ;
 #define MDCNFG_DCSE1   0x2             /* SDRAM CS 1 Enable */
 #define MDCNFG_DCSE0   0x1             /* SDRAM CS 0 Enable */
 
-       
-
 
 /* Data Flash Controller Registers */