Merge branch 'linus' into x86/i8259

[linux-2.6] / drivers / usb / core / urb.c

diff --git a/drivers/usb/core/urb.c b/drivers/usb/core/urb.c
index 1d3ed1322fbe295849652607984594fadef91047..c0b1ae25ae2a8923cf463bd670f3873acaf87102 100644 (file)
--- a/drivers/usb/core/urb.c
+++ b/drivers/usb/core/urb.c
@@ -334,7 +334,7 @@ int usb_submit_urb(struct urb *urb, gfp_t mem_flags)
                dev_dbg(&dev->dev,
                        "bogus endpoint ep%d%s in %s (bad maxpacket %d)\n",
                        usb_endpoint_num(&ep->desc), is_out ? "out" : "in",
-                       __FUNCTION__, max);
+                       __func__, max);
                return -EMSGSIZE;
        }