summaryrefslogtreecommitdiff
path: root/drivers/usb/otg
diff options
context:
space:
mode:
authorFelipe Balbi <felipe.balbi@nokia.com>2009-12-15 23:19:52 +0200
committerGreg Kroah-Hartman <gregkh@suse.de>2009-12-23 11:34:19 -0800
commit465f8294eea1ea206e3a008e7bfe0e8fd53991fc (patch)
tree26a311b0023d97ca17374db64b2d236e49c1461d /drivers/usb/otg
parent1c4bdc01b8a5cf6c54e5eb8bf9a727e38f0176cc (diff)
downloadlinux-3.10-465f8294eea1ea206e3a008e7bfe0e8fd53991fc.tar.gz
linux-3.10-465f8294eea1ea206e3a008e7bfe0e8fd53991fc.tar.bz2
linux-3.10-465f8294eea1ea206e3a008e7bfe0e8fd53991fc.zip
usb: otg: isp1301_omap: fix compile error
commit 91c8a5a9985d5bf9c55f6f82f183f57b050b2a3a broke compilation of this driver after it introduced otg_init() as a static inline in <linux/usb/otg.h> Reported-by: Tony Lindgren <tony@atomide.com> Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/otg')
-rw-r--r--drivers/usb/otg/isp1301_omap.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/otg/isp1301_omap.c b/drivers/usb/otg/isp1301_omap.c
index d54460a8817..78a20970926 100644
--- a/drivers/usb/otg/isp1301_omap.c
+++ b/drivers/usb/otg/isp1301_omap.c
@@ -843,7 +843,7 @@ static irqreturn_t omap_otg_irq(int irq, void *_isp)
static struct platform_device *otg_dev;
-static int otg_init(struct isp1301 *isp)
+static int isp1301_otg_init(struct isp1301 *isp)
{
u32 l;
@@ -1275,7 +1275,7 @@ static int __exit isp1301_remove(struct i2c_client *i2c)
static int isp1301_otg_enable(struct isp1301 *isp)
{
power_up(isp);
- otg_init(isp);
+ isp1301_otg_init(isp);
/* NOTE: since we don't change this, this provides
* a few more interrupts than are strictly needed.