From d5fee512f9f76d24a39b70234a48e8f7030f0c7e Mon Sep 17 00:00:00 2001
From: David Brownell <david-b@pacbell.net>
Date: Thu, 12 Jul 2007 22:08:22 -0700
Subject: [PATCH] --- yaml --- r: 61467 b: refs/heads/master c:
 aebdc3b450a3febf7d7d00cd2235509055ec7082 h: refs/heads/master i:   61465:
 7cff3ad62b0f9916d8428bc1891bca144ee8c722   61463:
 2cd0979707fe1aa840c4cc77df126c88534f7c01 v: v3

---
 [refs]                          |  2 +-
 trunk/drivers/usb/core/driver.c |  7 -------
 trunk/include/linux/device.h    | 10 ++++++++++
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index c5ef4379d6aa..6208e758c82d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bc37e2830339cbfa42ac8579a7bf62fc4cdd360d
+refs/heads/master: aebdc3b450a3febf7d7d00cd2235509055ec7082
diff --git a/trunk/drivers/usb/core/driver.c b/trunk/drivers/usb/core/driver.c
index 73c49362cd47..654857493a82 100644
--- a/trunk/drivers/usb/core/driver.c
+++ b/trunk/drivers/usb/core/driver.c
@@ -29,13 +29,6 @@
 #include "hcd.h"
 #include "usb.h"
 
-#define VERBOSE_DEBUG	0
-
-#if VERBOSE_DEBUG
-#define dev_vdbg	dev_dbg
-#else
-#define dev_vdbg(dev, fmt, args...)	do { } while (0)
-#endif
 
 #ifdef CONFIG_HOTPLUG
 
diff --git a/trunk/include/linux/device.h b/trunk/include/linux/device.h
index be2debed70d2..d9f0a57f5a2f 100644
--- a/trunk/include/linux/device.h
+++ b/trunk/include/linux/device.h
@@ -572,6 +572,16 @@ dev_dbg(struct device * dev, const char * fmt, ...)
 }
 #endif
 
+#ifdef VERBOSE_DEBUG
+#define dev_vdbg	dev_dbg
+#else
+static inline int __attribute__ ((format (printf, 2, 3)))
+dev_vdbg(struct device * dev, const char * fmt, ...)
+{
+	return 0;
+}
+#endif
+
 #define dev_err(dev, format, arg...)		\
 	dev_printk(KERN_ERR , dev , format , ## arg)
 #define dev_info(dev, format, arg...)		\