diff options
| author | Wolfgang Denk <wd@denx.de> | 2009-02-01 21:38:07 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2009-02-01 21:38:07 +0100 |
| commit | 6c6e042ab3bbfb5428e4cdeb38fa27728c63afdd (patch) | |
| tree | 0458ea450c3674b3d7aba64157e346f1d2553278 /include/asm-arm/arch-mx31/mx31-regs.h | |
| parent | ee924e00300bd1136589b2d5f8ad1f008df01bd4 (diff) | |
| parent | 4e69087a1d6ef2eca6f46026cf5e7399b6c9e7c0 (diff) | |
| download | u-boot-imx-6c6e042ab3bbfb5428e4cdeb38fa27728c63afdd.zip u-boot-imx-6c6e042ab3bbfb5428e4cdeb38fa27728c63afdd.tar.gz u-boot-imx-6c6e042ab3bbfb5428e4cdeb38fa27728c63afdd.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'include/asm-arm/arch-mx31/mx31-regs.h')
| -rw-r--r-- | include/asm-arm/arch-mx31/mx31-regs.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-arm/arch-mx31/mx31-regs.h b/include/asm-arm/arch-mx31/mx31-regs.h index b04a718..e736052 100644 --- a/include/asm-arm/arch-mx31/mx31-regs.h +++ b/include/asm-arm/arch-mx31/mx31-regs.h @@ -34,7 +34,7 @@ #define CCM_PDR1 (CCM_BASE + 0x08) #define CCM_RCSR (CCM_BASE + 0x0c) #define CCM_MPCTL (CCM_BASE + 0x10) -#define CCM_UPCTL (CCM_BASE + 0x10) +#define CCM_UPCTL (CCM_BASE + 0x14) #define CCM_SPCTL (CCM_BASE + 0x18) #define CCM_COSR (CCM_BASE + 0x1C) #define CCM_CGR0 (CCM_BASE + 0x20) |