Merge commit 'upstream/master'

[linux-2.6-omap-h63xx.git] / drivers / usb / gadget / net2280.h

diff --git a/drivers/usb/gadget/net2280.h b/drivers/usb/gadget/net2280.h
index 957d6df3401509c7c3c6af1b31874cf5fadf50fa..81a71dbdc2c6c029df26500ef37754f0c77c366e 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)
@@ -271,7 +272,7 @@ static inline void net2280_led_shutdown (struct net2280 *dev)
 
 #define ERROR(dev,fmt,args...) \
        xprintk(dev , KERN_ERR , fmt , ## args)
-#define WARN(dev,fmt,args...) \
+#define WARNING(dev,fmt,args...) \
        xprintk(dev , KERN_WARNING , fmt , ## args)
 #define INFO(dev,fmt,args...) \
        xprintk(dev , KERN_INFO , fmt , ## args)
@@ -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