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 branch 'tip/perf/urgent-3' of git://git.kernel.org/pub/scm/linux/kernel/git...
[pandora-kernel.git]
/
arch
/
arm
/
mach-mx3
/
mach-mx31lilly.c
diff --git
a/arch/arm/mach-mx3/mach-mx31lilly.c
b/arch/arm/mach-mx3/mach-mx31lilly.c
index
8f66f65
..
7c37daa
100644
(file)
--- a/
arch/arm/mach-mx3/mach-mx31lilly.c
+++ b/
arch/arm/mach-mx3/mach-mx31lilly.c
@@
-245,9
+245,9
@@
static struct mxc_usbh_platform_data usbh2_pdata = {
static void lilly1131_usb_init(void)
{
usbotg_pdata.otg = otg_ulpi_create(&mxc_ulpi_access_ops,
static void lilly1131_usb_init(void)
{
usbotg_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);
usbh2_pdata.otg = otg_ulpi_create(&mxc_ulpi_access_ops,
usbh2_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_usbh1, &usbh1_pdata);
mxc_register_device(&mxc_usbh2, &usbh2_pdata);
mxc_register_device(&mxc_usbh1, &usbh1_pdata);
mxc_register_device(&mxc_usbh2, &usbh2_pdata);