Merge branch 'preempt' into release

[sfrench/cifs-2.6.git] / arch / arm / plat-mxc / include / mach / mx31.h

diff --git a/arch/arm/plat-mxc/include/mach/mx31.h b/arch/arm/plat-mxc/include/mach/mx31.h
index 0b06941b6139d54430e85655465e88df92933afc..14ac0dcc82f4fdcde75e7703d7e548539250eb76 100644 (file)
--- a/arch/arm/plat-mxc/include/mach/mx31.h
+++ b/arch/arm/plat-mxc/include/mach/mx31.h
@@ -4,7 +4,7 @@
 #define MX31_IRAM_BASE_ADDR            0x1FFC0000      /* internal ram */
 #define MX31_IRAM_SIZE                 SZ_16K
 
-#define OTG_BASE_ADDR          (AIPS1_BASE_ADDR + 0x00088000)
+#define MX31_OTG_BASE_ADDR     (AIPS1_BASE_ADDR + 0x00088000)
 #define ATA_BASE_ADDR          (AIPS1_BASE_ADDR + 0x0008C000)
 #define UART4_BASE_ADDR        (AIPS1_BASE_ADDR + 0x000B0000)
 #define UART5_BASE_ADDR        (AIPS1_BASE_ADDR + 0x000B4000)