[PATCH v2 1/5] arm: imx: pca100: only try to enable USB if USB_ULPI is configured

[Lucas Stach]

Avoids a build failure if the config does not include ULPI support.

Signed-off-by: Lucas Stach <l.stach at pengutronix.de>
---
 arch/arm/boards/phytec-phycard-imx27/pca100.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/arch/arm/boards/phytec-phycard-imx27/pca100.c b/arch/arm/boards/phytec-phycard-imx27/pca100.c
index 895a3a395777..9475bfafcaa7 100644
--- a/arch/arm/boards/phytec-phycard-imx27/pca100.c
+++ b/arch/arm/boards/phytec-phycard-imx27/pca100.c
@@ -41,6 +41,7 @@
 #include <mach/iomux-mx27.h>
 #include <mach/devices-imx27.h>
 
+#if defined(CONFIG_USB) && defined(CONFIG_USB_ULPI)
 static void pca100_usb_register(void)
 {
 	mdelay(10);
@@ -55,6 +56,9 @@ static void pca100_usb_register(void)
 	ulpi_setup((void *)(MX27_USB_OTG_BASE_ADDR + 0x570), 1);
 	add_generic_usb_ehci_device(DEVICE_ID_DYNAMIC, MX27_USB_OTG_BASE_ADDR + 0x400, NULL);
 }
+#else
+static void pca100_usb_register(void) { };
+#endif
 
 static void pca100_usb_init(void)
 {
@@ -131,8 +135,7 @@ static int pca100_devices_init(void)
 	for (i = 0; i < ARRAY_SIZE(mode); i++)
 		imx_gpio_mode(mode[i]);
 
-	if (IS_ENABLED(CONFIG_USB))
-		pca100_usb_register();
+	pca100_usb_register();
 
 	imx_bbu_external_nand_register_handler("nand", "/dev/nand0.boot",
 			BBU_HANDLER_FLAG_DEFAULT);
-- 
2.1.3