diff --git a/[refs] b/[refs] index e58e79ad3ab7..d7f5bd669536 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e8656b02ef353e73d0625302c85026f80958c531 +refs/heads/master: 82760526e6d2e1d1e815abaf3eae42b8bb82968c diff --git a/trunk/include/linux/usb/serial.h b/trunk/include/linux/usb/serial.h index 6bed6db619b2..e71bc5ef234a 100644 --- a/trunk/include/linux/usb/serial.h +++ b/trunk/include/linux/usb/serial.h @@ -365,14 +365,6 @@ static inline void usb_serial_debug_data(int debug, function, size, size, data); } -/* Use our own dbg macro */ -#undef dbg -#define dbg(format, arg...) \ -do { \ - if (debug) \ - printk(KERN_DEBUG "%s: " format "\n", __FILE__, ##arg); \ -} while (0) - /* * Macro for reporting errors in write path to avoid inifinite loop * when port is used as a console.