git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.infradead.org/mtd-2.6
[pandora-kernel.git]
/
arch
/
arm
/
mach-mx3
/
mach-pcm043.c
diff --git
a/arch/arm/mach-mx3/mach-pcm043.c
b/arch/arm/mach-mx3/mach-pcm043.c
index
47f5311
..
28886f0
100644
(file)
--- a/
arch/arm/mach-mx3/mach-pcm043.c
+++ b/
arch/arm/mach-mx3/mach-pcm043.c
@@
-378,7
+378,7
@@
static void __init mxc_board_init(void)
#if defined(CONFIG_USB_ULPI)
if (otg_mode_host) {
otg_pdata.otg = otg_ulpi_create(&mxc_ulpi_access_ops,
#if defined(CONFIG_USB_ULPI)
if (otg_mode_host) {
otg_pdata.otg = otg_ulpi_create(&mxc_ulpi_access_ops,
- U
SB_OTG_DRV_VBUS | USB_OTG_DRV_
VBUS_EXT);
+ U
LPI_OTG_DRVVBUS | ULPI_OTG_DRV
VBUS_EXT);
mxc_register_device(&mxc_otg_host, &otg_pdata);
}
mxc_register_device(&mxc_otg_host, &otg_pdata);
}