diff --git a/[refs] b/[refs] index b1ac2ef92ce6..38c17194b296 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ff66e3ce3524125106be3ff18104ecde0849b85c +refs/heads/master: f66396b55d4016bdc7a5298db7a681c63b649bf4 diff --git a/trunk/include/linux/usb.h b/trunk/include/linux/usb.h index 285011d9af17..dd9733cc0ac2 100644 --- a/trunk/include/linux/usb.h +++ b/trunk/include/linux/usb.h @@ -1701,13 +1701,12 @@ extern void usb_unregister_notify(struct notifier_block *nb); #define dbg(format, arg...) do {} while (0) #endif -#define err(format, arg...) printk(KERN_ERR "%s: " format "\n" , \ - __FILE__ , ## arg) -#define info(format, arg...) printk(KERN_INFO "%s: " format "\n" , \ - __FILE__ , ## arg) -#define warn(format, arg...) printk(KERN_WARNING "%s: " format "\n" , \ - __FILE__ , ## arg) - +#define err(format, arg...) printk(KERN_ERR KBUILD_MODNAME ": " \ + format "\n" , ## arg) +#define info(format, arg...) printk(KERN_INFO KBUILD_MODNAME ": " \ + format "\n" , ## arg) +#define warn(format, arg...) printk(KERN_WARNING KBUILD_MODNAME ": " \ + format "\n" , ## arg) #endif /* __KERNEL__ */