summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlejandro Gonzalez <alex.gonzalez@digi.com>2010-05-28 19:05:48 +0200
committerAlejandro Gonzalez <alex.gonzalez@digi.com>2010-05-31 11:19:31 +0200
commitb6f823464db345479dbe8b9dc3a656d5e386254d (patch)
tree701ab8acb0f018398184e71e3062733a39612897
parent3e8bb81fd7969784b344db360363d549fec779ba (diff)
ccwmx51: Don't initialize USB host 1 if not configured.
Signed-off-by: Alejandro Gonzalez <alex.gonzalez@digi.com>
-rw-r--r--arch/arm/mach-mx5/mx51_ccwmx51js.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-mx5/mx51_ccwmx51js.c b/arch/arm/mach-mx5/mx51_ccwmx51js.c
index 92c721297dfc..d85c62272340 100644
--- a/arch/arm/mach-mx5/mx51_ccwmx51js.c
+++ b/arch/arm/mach-mx5/mx51_ccwmx51js.c
@@ -276,7 +276,9 @@ static void __init mxc_board_init(void)
#endif
ccwmx51_init_spidevices();
ccwmx51_init_i2c2();
+#if defined(CONFIG_USB_EHCI_ARC_H1) || defined(CONFIG_USB_EHCI_ARC_H1_MODULE)
mx5_usbh1_init();
+#endif
mx5_usb_dr_init();
#if defined(CONFIG_FB_MXC_SYNC_PANEL) || defined(CONFIG_FB_MXC_SYNC_PANEL_MODULE)
mxc_register_device(&lcd_pdev, plcd_platform_data);