summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-mx2
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2010-05-24 23:08:54 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2010-05-24 23:08:54 +0100
commitf949c0edd84101bfd30b3e7389c1a12b067e561d (patch)
treeba39033c089a66a8d4ac058f3f03a8ed2a488f91 /arch/arm/mach-mx2
parent119c4b1257e44d9ec981465ccb80aba427a96dda (diff)
parent92d2040d78f662f634efce7a5106bbed70b8708b (diff)
downloadop-kernel-dev-f949c0edd84101bfd30b3e7389c1a12b067e561d.zip
op-kernel-dev-f949c0edd84101bfd30b3e7389c1a12b067e561d.tar.gz
Merge branch 'master' into devel
Diffstat (limited to 'arch/arm/mach-mx2')
-rw-r--r--arch/arm/mach-mx2/devices.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-mx2/devices.c b/arch/arm/mach-mx2/devices.c
index a9377ce..a0aeb8a 100644
--- a/arch/arm/mach-mx2/devices.c
+++ b/arch/arm/mach-mx2/devices.c
@@ -478,8 +478,8 @@ int __init mxc_register_gpios(void)
#ifdef CONFIG_MACH_MX21
static struct resource mx21_usbhc_resources[] = {
{
- .start = MX21_BASE_ADDR,
- .end = MX21_BASE_ADDR + 0x1FFF,
+ .start = MX21_USBOTG_BASE_ADDR,
+ .end = MX21_USBOTG_BASE_ADDR + SZ_8K - 1,
.flags = IORESOURCE_MEM,
},
{
OpenPOWER on IntegriCloud