Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next

[pandora-kernel.git] / include / linux / device.h

diff --git a/include/linux/device.h b/include/linux/device.h
index ea70bb2..46751bd 100644 (file)
--- a/include/linux/device.h
+++ b/include/linux/device.h
@@ -787,6 +787,8 @@ extern const char *dev_driver_string(const struct device *dev);
 
 #ifdef CONFIG_PRINTK
 
+extern int __dev_printk(const char *level, const struct device *dev,
+                       struct va_format *vaf);
 extern int dev_printk(const char *level, const struct device *dev,
                      const char *fmt, ...)
        __attribute__ ((format (printf, 3, 4)));
@@ -807,6 +809,9 @@ extern int _dev_info(const struct device *dev, const char *fmt, ...)
 
 #else
 
+static inline int __dev_printk(const char *level, const struct device *dev,
+                              struct va_format *vaf)
+        { return 0; }
 static inline int dev_printk(const char *level, const struct device *dev,
                      const char *fmt, ...)
        __attribute__ ((format (printf, 3, 4)));