From f4fa3af2edec88db8a00b8e952b388b6a4f7d890 Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Wed, 25 Apr 2012 14:55:16 -0700
Subject: [PATCH] --- yaml --- r: 303634 b: refs/heads/master c:
 af4e1ee04026908086d7ed252db2619a8ceaa333 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 08311e530461..abda5c6ca658 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8048926bb898730b41c4c2698e9aefb16870488c
+refs/heads/master: af4e1ee04026908086d7ed252db2619a8ceaa333
diff --git a/trunk/include/linux/usb.h b/trunk/include/linux/usb.h
index 22e9b328975b..45bc7a5225ab 100644
--- a/trunk/include/linux/usb.h
+++ b/trunk/include/linux/usb.h
@@ -1653,9 +1653,6 @@ do {									\
 } while (0)
 #endif
 
-#define err(format, arg...)					\
-	printk(KERN_ERR KBUILD_MODNAME ": " format "\n", ##arg)
-
 /* debugfs stuff */
 extern struct dentry *usb_debug_root;