]> bbs.cooldavid.org Git - net-next-2.6.git/commitdiff
USB: musb: blackfin: fix musb_read_txhubport() definition
authorIan Jeffray <ian@jeffray.co.uk>
Sat, 23 Oct 2010 10:11:56 +0000 (05:11 -0500)
committerFelipe Balbi <balbi@ti.com>
Fri, 5 Nov 2010 11:59:32 +0000 (13:59 +0200)
The new MUSB power code needs musb_read_txhubport() to
return a value (so stub it as 0 like the other Blackfin
hub funcs).

Signed-off-by: Ian Jeffray <ian@jeffray.co.uk>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Felipe Balbi <balbi@ti.com>
drivers/usb/musb/musb_regs.h

index 244267527a60b1421ea7c70a814388dde6951f7f..5a727c5b86763fdb1f65347c9f02a44d49d70568 100644 (file)
@@ -633,8 +633,9 @@ static inline u8  musb_read_txhubaddr(void __iomem *mbase, u8 epnum)
        return 0;
 }
 
-static inline void  musb_read_txhubport(void __iomem *mbase, u8 epnum)
+static inline u8 musb_read_txhubport(void __iomem *mbase, u8 epnum)
 {
+       return 0;
 }
 
 #endif /* CONFIG_BLACKFIN */