diff --git a/[refs] b/[refs] index df5a6b28b61c..2070f73d8fee 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f42ae0e9f4996308860d5cee4803337d3ce3c4ae +refs/heads/master: 5a36c399234d511a347b2be4382c7a55f28c18ba diff --git a/trunk/arch/arm/mach-mx25/devices.c b/trunk/arch/arm/mach-mx25/devices.c index fd331d04ea0d..d9766d4d5046 100644 --- a/trunk/arch/arm/mach-mx25/devices.c +++ b/trunk/arch/arm/mach-mx25/devices.c @@ -117,8 +117,6 @@ struct platform_device mxc_uart_device4 = { .num_resources = ARRAY_SIZE(uart4), }; -#define MX25_OTG_BASE_ADDR 0x53FF4000 - static u64 otg_dmamask = DMA_BIT_MASK(32); static struct resource mxc_otg_resources[] = { diff --git a/trunk/arch/arm/plat-mxc/include/mach/mx25.h b/trunk/arch/arm/plat-mxc/include/mach/mx25.h index 35fb9f5e5d1c..f064ec8833bb 100644 --- a/trunk/arch/arm/plat-mxc/include/mach/mx25.h +++ b/trunk/arch/arm/plat-mxc/include/mach/mx25.h @@ -35,6 +35,7 @@ #define MX25_DRYICE_BASE_ADDR 0x53ffc000 #define MX25_LCDC_BASE_ADDR 0x53fbc000 #define MX25_KPP_BASE_ADDR 0x43fa8000 +#define MX25_OTG_BASE_ADDR 0x53ff4000 #define MX25_INT_DRYICE 25 #define MX25_INT_FEC 57