From dd6c72eca340629d021c6fab5b68804ccb880a78 Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <gregkh@suse.de>
Date: Thu, 14 Aug 2008 09:37:34 -0700
Subject: [PATCH] --- yaml --- r: 127297 b: refs/heads/master c:
 338b67b0c1a97ca705023a8189cf41aa0828d294 h: refs/heads/master i:   127295:
 a8b16c745c28b132459895ca126e5be4b5b10e1e v: v3

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

diff --git a/[refs] b/[refs]
index 541332f3eb42..2a206cd04170 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5aa637505fb8610cd2724b09fa0ab03fd6cdca63
+refs/heads/master: 338b67b0c1a97ca705023a8189cf41aa0828d294
diff --git a/trunk/include/linux/usb.h b/trunk/include/linux/usb.h
index e89639896508..28f68f587793 100644
--- a/trunk/include/linux/usb.h
+++ b/trunk/include/linux/usb.h
@@ -1744,8 +1744,6 @@ extern void usb_unregister_notify(struct notifier_block *nb);
 	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__ */