From c523d48399a81123d470683d94f022b547a6385e Mon Sep 17 00:00:00 2001 From: Anand Gadiyar Date: Mon, 24 Aug 2009 20:14:45 +0530 Subject: [PATCH] --- yaml --- r: 165027 b: refs/heads/master c: d77282c836d6c2601da6a188812b20cff8e9bbe2 h: refs/heads/master i: 165025: 81d9d41627f655889a90d9ed374e3692996a9c5d 165023: 61e8a60d7b849cfbe7fe912289be92fda4ec5a8d v: v3 --- [refs] | 2 +- trunk/drivers/usb/otg/isp1301_omap.c | 23 +++-------------------- 2 files changed, 4 insertions(+), 21 deletions(-) diff --git a/[refs] b/[refs] index f3f6e7142cc3..62e22b86205e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7f536692afd45eea349501beb2b76492a3524a28 +refs/heads/master: d77282c836d6c2601da6a188812b20cff8e9bbe2 diff --git a/trunk/drivers/usb/otg/isp1301_omap.c b/trunk/drivers/usb/otg/isp1301_omap.c index e0d56ef2bcb0..77a5f4188999 100644 --- a/trunk/drivers/usb/otg/isp1301_omap.c +++ b/trunk/drivers/usb/otg/isp1301_omap.c @@ -117,24 +117,7 @@ static void enable_vbus_draw(struct isp1301 *isp, unsigned mA) pr_debug(" VBUS %d mA error %d\n", mA, status); } -static void enable_vbus_source(struct isp1301 *isp) -{ - /* this board won't supply more than 8mA vbus power. - * some boards can switch a 100ma "unit load" (or more). - */ -} - - -/* products will deliver OTG messages with LEDs, GUI, etc */ -static inline void notresponding(struct isp1301 *isp) -{ - printk(KERN_NOTICE "OTG device not responding.\n"); -} - - -#endif - -#if defined(CONFIG_MACH_OMAP_H4) +#else static void enable_vbus_draw(struct isp1301 *isp, unsigned mA) { @@ -144,6 +127,8 @@ static void enable_vbus_draw(struct isp1301 *isp, unsigned mA) */ } +#endif + static void enable_vbus_source(struct isp1301 *isp) { /* this board won't supply more than 8mA vbus power. @@ -159,8 +144,6 @@ static inline void notresponding(struct isp1301 *isp) } -#endif - /*-------------------------------------------------------------------------*/ static struct i2c_driver isp1301_driver;