diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-01-04 10:51:38 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-01-04 10:51:38 -0500 |
| commit | 3ac584317adcc4be4466db967f3355c3e42cbda3 (patch) | |
| tree | b0b3f5751f4a1aed799841cef231b7d520020db7 /arch/arm/mach-mx3/mx31moboard-marxbot.c | |
| parent | 1df4bb4af42459a4a10e7b21794a6f44463534e6 (diff) | |
| parent | f9ffaa9ca9889f17ef30b82bc0bf954d141280f8 (diff) | |
Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6
Diffstat (limited to 'arch/arm/mach-mx3/mx31moboard-marxbot.c')
| -rw-r--r-- | arch/arm/mach-mx3/mx31moboard-marxbot.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-mx3/mx31moboard-marxbot.c b/arch/arm/mach-mx3/mx31moboard-marxbot.c index 85184a35e674..1f44b9ccbb0f 100644 --- a/arch/arm/mach-mx3/mx31moboard-marxbot.c +++ b/arch/arm/mach-mx3/mx31moboard-marxbot.c | |||
| @@ -294,7 +294,7 @@ static int __init marxbot_usbh1_init(void) | |||
| 294 | 294 | ||
| 295 | usbh1_pdata.otg = otg; | 295 | usbh1_pdata.otg = otg; |
| 296 | 296 | ||
| 297 | return mxc_register_device(&mx31_usbh1, &usbh1_pdata); | 297 | return mxc_register_device(&mxc_usbh1, &usbh1_pdata); |
| 298 | } | 298 | } |
| 299 | 299 | ||
| 300 | /* | 300 | /* |