diff options
| author | Wolfgang Denk <wd@atlas.denx.de> | 2006-03-06 23:18:48 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@atlas.denx.de> | 2006-03-06 23:18:48 +0100 |
| commit | 951a954b77ef30df1f5c1b7b9b4312e783b2cbb4 (patch) | |
| tree | 8f94ab1a2e15fbf31c322e6be1f750e10ac2fe2f /include/asm-arm | |
| parent | ac7d97dcbb499c96c8182757f301dd2e09c9f49d (diff) | |
| parent | bfc81252c0de3bfcf92c7c35bc04341fb33e4e4e (diff) | |
| download | talos-obmc-uboot-951a954b77ef30df1f5c1b7b9b4312e783b2cbb4.tar.gz talos-obmc-uboot-951a954b77ef30df1f5c1b7b9b4312e783b2cbb4.zip | |
Merge with /home/wd/git/u-boot/master
Code cleanup.
Diffstat (limited to 'include/asm-arm')
| -rw-r--r-- | include/asm-arm/arch-pxa/pxa-regs.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/include/asm-arm/arch-pxa/pxa-regs.h b/include/asm-arm/arch-pxa/pxa-regs.h index 5d36b84b07..83ae5e3e13 100644 --- 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 */ |
