From d4854f5428cd8215c2fc9b26e38623b589a024eb Mon Sep 17 00:00:00 2001 From: Uladzimir Bely Date: Thu, 14 Mar 2013 14:36:47 +0300 Subject: Fix for latest freescale patches Conflicts: drivers/video/mxc_hdmi.c Signed-off-by: Christian Hemp --- arch/arm/mach-mx6/board-mx6q_phyflex.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'arch') 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"); -- cgit v1.2.3