From: Arnd Bergmann <arnd@arndb.de>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Felipe Balbi <balbi@ti.com>,
linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
Arnd Bergmann <arnd@arndb.de>,
linux-omap@vger.kernel.org
Subject: [PATCH 4/8] usb: phy: fix isp1301-omap dependency on tps65010
Date: Thu, 8 May 2014 15:52:17 +0200 [thread overview]
Message-ID: <1399557141-1346645-5-git-send-email-arnd@arndb.de> (raw)
In-Reply-To: <1399557141-1346645-1-git-send-email-arnd@arndb.de>
The isp1301-omap driver cannot be built-in if the tps65010 driver
is a module, otherwise we get a link error from the reference to
the tps65010_set_vbus_draw function.
There is already a hack in the driver to work around the problem
of tps65010 being not available at all. This patch extends that
hack to ensure that the real tps65010_set_vbus_draw() function
is only called when it's avaiable.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: linux-omap@vger.kernel.org
---
drivers/usb/phy/phy-isp1301-omap.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/usb/phy/phy-isp1301-omap.c b/drivers/usb/phy/phy-isp1301-omap.c
index 6e146d7..35a0dd2 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>
--
1.8.3.2
next prev parent reply other threads:[~2014-05-08 13:52 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <1399557141-1346645-1-git-send-email-arnd@arndb.de>
2014-05-08 13:52 ` [PATCH 2/8] usb: musb: tusb-dma can't be built-in if tusb is not Arnd Bergmann
2014-05-08 13:52 ` [PATCH 3/8] usb: musb: omap2plus bus glue needs USB host support Arnd Bergmann
2014-05-08 13:52 ` Arnd Bergmann [this message]
[not found] ` <1399557141-1346645-5-git-send-email-arnd-r2nGTMty4D4@public.gmane.org>
2014-05-13 15:26 ` [PATCH 4/8] usb: phy: fix isp1301-omap dependency on tps65010 Felipe Balbi
2014-05-13 19:48 ` Arnd Bergmann
2014-05-13 19:52 ` Felipe Balbi
2014-05-08 13:52 ` [PATCH 7/8] usb: ohci: sort out dependencies for lpc32xx and omap Arnd Bergmann
2014-05-08 15:51 ` Alan Stern
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1399557141-1346645-5-git-send-email-arnd@arndb.de \
--to=arnd@arndb.de \
--cc=balbi@ti.com \
--cc=gregkh@linuxfoundation.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-omap@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox