diff --git a/[refs] b/[refs] index 9cd4bc89d69e..c61a2f3353b7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3b923993daaa38f1ae297a79f734c308866dd026 +refs/heads/master: 7275fc4c16ef50e99d3755265a4ae83e3afe63d0 diff --git a/trunk/drivers/usb/gadget/ci13xxx_udc.h b/trunk/drivers/usb/gadget/ci13xxx_udc.h index 0d31af56c989..c4cec6a43d5e 100644 --- a/trunk/drivers/usb/gadget/ci13xxx_udc.h +++ b/trunk/drivers/usb/gadget/ci13xxx_udc.h @@ -212,7 +212,6 @@ do { \ "[%s] " format "\n", __func__, ## args); \ } while (0) -#define err(format, args...) ci13xxx_printk(KERN_ERR, format, ## args) #define warn(format, args...) ci13xxx_printk(KERN_WARNING, format, ## args) #define info(format, args...) ci13xxx_printk(KERN_INFO, format, ## args)