diff options
| author | Uladzimir Bely <u.bely@sam-solutions.net> | 2013-03-14 14:36:47 +0300 |
|---|---|---|
| committer | Justin Waters <justin.waters@timesys.com> | 2013-11-07 12:19:26 -0500 |
| commit | d4854f5428cd8215c2fc9b26e38623b589a024eb (patch) | |
| tree | a782d72d16eeafa80973d3750658e57e8ec5eed9 /arch | |
| parent | fdd22c8b7560c25264dfb8d5c17a4447846749e8 (diff) | |
Fix for latest freescale patches
Conflicts:
drivers/video/mxc_hdmi.c
Signed-off-by: Christian Hemp <c.hemp@phytec.de>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-mx6/board-mx6q_phyflex.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-mx6/board-mx6q_phyflex.c b/arch/arm/mach-mx6/board-mx6q_phyflex.c index 125a88ea7fe6..3fb0f2c5e5e5 100644 --- a/arch/arm/mach-mx6/board-mx6q_phyflex.c +++ b/arch/arm/mach-mx6/board-mx6q_phyflex.c @@ -494,7 +494,7 @@ static void __init mx6_phyflex_init_usb(void) // ToDo: remove next line when usb pwr are fixed. Turn on VBUS power for USB. imx6_phyflex_usbotg_vbus(true); - mx6_usb_dr_init(); +/* mx6_usb_dr_init(); */ /* Enable USB hub power */ ret = gpio_request(MX6_PHYFLEX_USB_HOST1_PWR, "usb-host1-pwr"); |