diff options
| author | Uwe Kleine-König | 2009-12-22 17:31:05 +0100 |
|---|---|---|
| committer | Sascha Hauer | 2010-01-04 13:26:23 +0100 |
| commit | f9ffaa9ca9889f17ef30b82bc0bf954d141280f8 (patch) | |
| tree | 08509a9a4fe94b7be9cf5ef43d9b376dae4e1e52 /arch/arm/mach-mx3/mx31moboard.c | |
| parent | ARM: MX3: make CPU revision number detection work on all boards (diff) | |
| download | kernel-qcow2-linux-f9ffaa9ca9889f17ef30b82bc0bf954d141280f8.tar.gz kernel-qcow2-linux-f9ffaa9ca9889f17ef30b82bc0bf954d141280f8.tar.xz kernel-qcow2-linux-f9ffaa9ca9889f17ef30b82bc0bf954d141280f8.zip | |
imx/mx3: depend on USB_ULPI for otg_ulpi_create
otg_ulpi_create is defined in drivers/usb/otg/ulpi.c which depends on
CONFIG_USB_ULPI. So protect its usage by the same symbol. Moreover
mxc_ulpi_access_ops needs CONFIG_MXC_ULPI.
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Cc: Sascha Hauer <s.hauer@pengutronix.de>
Cc: Valentin Longchamp <valentin.longchamp@epfl.ch>
Cc: Daniel Mack <daniel@caiaq.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/mach-mx3/mx31moboard.c')
| -rw-r--r-- | arch/arm/mach-mx3/mx31moboard.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm/mach-mx3/mx31moboard.c b/arch/arm/mach-mx3/mx31moboard.c index 839f09aef8b2..cfd605d078ec 100644 --- a/arch/arm/mach-mx3/mx31moboard.c +++ b/arch/arm/mach-mx3/mx31moboard.c @@ -346,6 +346,8 @@ static struct fsl_usb2_platform_data usb_pdata = { .phy_mode = FSL_USB2_PHY_ULPI, }; +#if defined(CONFIG_USB_ULPI) + #define USBH2_EN_B IOMUX_TO_GPIO(MX31_PIN_SCK6) static int moboard_usbh2_hw_init(struct platform_device *pdev) @@ -394,6 +396,9 @@ static int __init moboard_usbh2_init(void) return mxc_register_device(&mxc_usbh2, &usbh2_pdata); } +#else +static inline int moboard_usbh2_init(void) { return 0; } +#endif static struct gpio_led mx31moboard_leds[] = { |