Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block

[linux-2.6] / drivers / usb / gadget / zero.c

diff --git a/drivers/usb/gadget/zero.c b/drivers/usb/gadget/zero.c
index fcde5d9c87df11eb6d867f7ff4a3bee075c96bc4..d3d4f4048e6c39f7f958e263cf1761d194c25d34 100644 (file)
--- a/drivers/usb/gadget/zero.c
+++ b/drivers/usb/gadget/zero.c
@@ -1115,7 +1115,7 @@ zero_bind (struct usb_gadget *gadget)
        ep = usb_ep_autoconfig (gadget, &fs_source_desc);
        if (!ep) {
 autoconf_fail:
-               printk (KERN_ERR "%s: can't autoconfigure on %s\n",
+               pr_err("%s: can't autoconfigure on %s\n",
                        shortname, gadget->name);
                return -ENODEV;
        }
@@ -1139,7 +1139,7 @@ autoconf_fail:
                 * things like configuration and altsetting numbering
                 * can need hardware-specific attention though.
                 */
-               printk (KERN_WARNING "%s: controller '%s' not recognized\n",
+               pr_warning("%s: controller '%s' not recognized\n",
                        shortname, gadget->name);
                device_desc.bcdDevice = __constant_cpu_to_le16 (0x9999);
        }