From: Felipe Balbi <balbi@ti.com>
Date: Mon, 21 Apr 2014 15:50:35 +0000 (-0500)
Subject: usb: phy: generic: switch over to IS_ENABLED()
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=dca769bd5a76e9e634cc36987760306846153cac;p=openwrt%2Fstaging%2Fblogic.git

usb: phy: generic: switch over to IS_ENABLED()

when checking if our generic PHY is enabled,
it's a lot easier to use IS_ENABLED() instead
of manually checking for it. While at that, also
remove the bogus defined(MODULE) at the end of
the line.

Signed-off-by: Felipe Balbi <balbi@ti.com>
---

diff --git a/include/linux/usb/usb_phy_generic.h b/include/linux/usb/usb_phy_generic.h
index 8346bcc50c2f..68adae83affc 100644
--- a/include/linux/usb/usb_phy_generic.h
+++ b/include/linux/usb/usb_phy_generic.h
@@ -13,7 +13,7 @@ struct usb_phy_generic_platform_data {
 	int gpio_reset;
 };
 
-#if defined(CONFIG_NOP_USB_XCEIV) || (defined(CONFIG_NOP_USB_XCEIV_MODULE) && defined(MODULE))
+#if IS_ENABLED(CONFIG_NOP_USB_XCEIV)
 /* sometimes transceivers are accessed only through e.g. ULPI */
 extern struct platform_device *usb_phy_generic_register(void);
 extern void usb_phy_generic_unregister(struct platform_device *);