summaryrefslogtreecommitdiff
path: root/drivers/usb/phy
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-05-19 01:33:09 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-05-19 01:33:09 +0300
commit909eacd748b3c8d15e6a239aa67f7828885d798e (patch)
tree87f88e6c53800a3f9b8cc0867845cf116c7416fe /drivers/usb/phy
parentaa519be34f45954f33a6c20430deac8e544a180f (diff)
parente26081808edadfd257c6c9d81014e3b25e9a6118 (diff)
downloadlinux-909eacd748b3c8d15e6a239aa67f7828885d798e.tar.xz
Merge 4.1-rc4 into usb-next
We want the fixes in here as well. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/phy')
-rw-r--r--drivers/usb/phy/phy-isp1301-omap.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/phy/phy-isp1301-omap.c b/drivers/usb/phy/phy-isp1301-omap.c
index 1e0e10dd6ba5..3af263cc0caa 100644
--- a/drivers/usb/phy/phy-isp1301-omap.c
+++ b/drivers/usb/phy/phy-isp1301-omap.c
@@ -94,7 +94,7 @@ struct isp1301 {
#if defined(CONFIG_MACH_OMAP_H2) || defined(CONFIG_MACH_OMAP_H3)
-#if defined(CONFIG_TPS65010) || defined(CONFIG_TPS65010_MODULE)
+#if defined(CONFIG_TPS65010) || (defined(CONFIG_TPS65010_MODULE) && defined(MODULE))
#include <linux/i2c/tps65010.h>