summaryrefslogtreecommitdiff
path: root/arch/arm/mach-at91/include/mach/at91sam9260.h
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2010-08-04 15:43:45 +0400
committerTony Lindgren <tony@atomide.com>2010-08-04 15:43:45 +0400
commit7590d1defdc720a97a9e186f45f529c4ae1b40f7 (patch)
treee7ffdc043a2847f410d654d8e99e001f3138937a /arch/arm/mach-at91/include/mach/at91sam9260.h
parent7e788b4289bb025a96e327c604cb2db92e17108f (diff)
parent869fef41547db95df8523bf67845a21313709428 (diff)
downloadlinux-7590d1defdc720a97a9e186f45f529c4ae1b40f7.tar.xz
Merge branch 'devel-map-io' into omap-for-linus
Diffstat (limited to 'arch/arm/mach-at91/include/mach/at91sam9260.h')
-rw-r--r--arch/arm/mach-at91/include/mach/at91sam9260.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-at91/include/mach/at91sam9260.h b/arch/arm/mach-at91/include/mach/at91sam9260.h
index 43c396b9b4cb..4e79036d3b80 100644
--- a/arch/arm/mach-at91/include/mach/at91sam9260.h
+++ b/arch/arm/mach-at91/include/mach/at91sam9260.h
@@ -84,7 +84,7 @@
* System Peripherals (offset from AT91_BASE_SYS)
*/
#define AT91_ECC (0xffffe800 - AT91_BASE_SYS)
-#define AT91_SDRAMC (0xffffea00 - AT91_BASE_SYS)
+#define AT91_SDRAMC0 (0xffffea00 - AT91_BASE_SYS)
#define AT91_SMC (0xffffec00 - AT91_BASE_SYS)
#define AT91_MATRIX (0xffffee00 - AT91_BASE_SYS)
#define AT91_CCFG (0xffffef10 - AT91_BASE_SYS)