From f8af581fa15b35d92d4e5e376cd214c4f0a55a8f Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Tue, 18 Sep 2012 09:38:33 +0100
Subject: [PATCH] --- yaml --- r: 326079 b: refs/heads/master c:
 82760526e6d2e1d1e815abaf3eae42b8bb82968c h: refs/heads/master i:   326077:
 977097c5afed100afd6c4c4afb257b0a1a1cdf3f   326075:
 f4f38eae94f4f6caa8bb5c1df6ac0088f4406c0c   326071:
 b7b06a93f82aaeae6c7782cbc024450900d002c7   326063:
 a545cbac2cb0a6232a2eb7f0be2d16f35a952643   326047:
 7a33142398abbca964c96574e04db4226710f8b3   326015:
 8b421aa93895fa0d7217b0be251d8af15bf2c56d v: v3

---
 [refs]                           | 2 +-
 trunk/include/linux/usb/serial.h | 8 --------
 2 files changed, 1 insertion(+), 9 deletions(-)

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.