Merge branch 'cpus4096-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[mv-sheeva.git] / drivers / usb / gadget / net2280.h

diff --git a/drivers/usb/gadget/net2280.h b/drivers/usb/gadget/net2280.h
index 957d6df3401509c7c3c6af1b31874cf5fadf50fa..1f2af398a9a405df9e78192080474114c2ac95f6 100644 (file)
--- a/drivers/usb/gadget/net2280.h
+++ b/drivers/usb/gadget/net2280.h
@@ -110,7 +110,8 @@ struct net2280_ep {
                                                out_overflow : 1,
                                                stopped : 1,
                                                is_in : 1,
-                                               is_iso : 1;
+                                               is_iso : 1,
+                                               responded : 1;
 };
 
 static inline void allow_status (struct net2280_ep *ep)
@@ -298,7 +299,7 @@ static inline void assert_out_naking (struct net2280_ep *ep, const char *where)
                        &ep->regs->ep_rsp);
        }
 }
-#define ASSERT_OUT_NAKING(ep) assert_out_naking(ep,__FUNCTION__)
+#define ASSERT_OUT_NAKING(ep) assert_out_naking(ep,__func__)
 #else
 #define ASSERT_OUT_NAKING(ep) do {} while (0)
 #endif