Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6

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

diff --git a/drivers/usb/gadget/net2280.h b/drivers/usb/gadget/net2280.h
index 44ca139983d8e4c302f5f50a3918071b416179f9..c36852263d93bafa979214d16dacc7fd07af43a9 100644 (file)
--- a/drivers/usb/gadget/net2280.h
+++ b/drivers/usb/gadget/net2280.h
@@ -109,6 +109,7 @@ struct net2280_ep {
                                                in_fifo_validate : 1,
                                                out_overflow : 1,
                                                stopped : 1,
+                                               wedged : 1,
                                                is_in : 1,
                                                is_iso : 1,
                                                responded : 1;
@@ -272,7 +273,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)
@@ -299,7 +300,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