diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2015-04-11 00:06:10 +0200 |
|---|---|---|
| committer | Felipe Balbi <balbi@ti.com> | 2015-04-27 14:45:14 -0500 |
| commit | 197d0bdf8b0168d69c400d3936d08066ab1499a7 (patch) | |
| tree | 42de789963fa14f7f59ad604c2b878ea8011b890 | |
| parent | 3e9d3d2efc677b501b12512cab5adb4f32a0673a (diff) | |
| download | linux-197d0bdf8b0168d69c400d3936d08066ab1499a7.tar.gz linux-197d0bdf8b0168d69c400d3936d08066ab1499a7.tar.bz2 linux-197d0bdf8b0168d69c400d3936d08066ab1499a7.zip | |
usb: phy: isp1301: work around tps65010 dependency
The isp1301-omap driver contains special hooks for the TPS65010
power management controller. It provides its own 'tps65010_set_vbus_draw'
wrapper in case that driver is not enabled through Kconfig, but
fails to handle the case where isp1301-omap is built-in but TPS65010
is a loadable module, which currently results in a link error:
drivers/built-in.o: In function `isp1301_set_power':
:(.text+0x14e188): undefined reference to `tps65010_set_vbus_draw'
This is a workaround to use the same trick as before also when
tps65010 is a module. Doing a proper fix would require much larger
changes to the driver that is not really worth it when the usb-phy
drivers are going to eventually get replaced with generic-phy
drivers.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Felipe Balbi <balbi@ti.com>
| -rw-r--r-- | drivers/usb/phy/phy-isp1301-omap.c | 2 |
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> |