From 466f8286dd9dd885d9e9fd48c70679d5a4e57078 Mon Sep 17 00:00:00 2001
From: Ian Jeffray <ian@jeffray.co.uk>
Date: Sat, 23 Oct 2010 05:11:56 -0500
Subject: [PATCH] --- yaml --- r: 221922 b: refs/heads/master c:
 5d726f5add3af537952f7c35fdaebab43b718c2d h: refs/heads/master v: v3

---
 [refs]                             | 2 +-
 trunk/drivers/usb/musb/musb_regs.h | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index a0bbee69f780..e9150e8342c9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 31c9909b512aa4c97cffc40627c255070fe0bc78
+refs/heads/master: 5d726f5add3af537952f7c35fdaebab43b718c2d
diff --git a/trunk/drivers/usb/musb/musb_regs.h b/trunk/drivers/usb/musb/musb_regs.h
index 244267527a60..5a727c5b8676 100644
--- a/trunk/drivers/usb/musb/musb_regs.h
+++ b/trunk/drivers/usb/musb/musb_regs.h
@@ -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 */