Merge remote-tracking branch 'trivial/for-next'

[karo-tx-linux.git] / include / linux / device.h

diff --git a/include/linux/device.h b/include/linux/device.h
index 6d6f1fec092fe5df78671f5b352931a2edae4aca..22225cc33e14353fd8221fce0a741f4787447157 100644 (file)
--- a/include/linux/device.h
+++ b/include/linux/device.h
@@ -1291,8 +1291,9 @@ do {                                                                      \
  * dev_WARN*() acts like dev_printk(), but with the key difference of
  * using WARN/WARN_ONCE to include file/line information and a backtrace.
  */
-#define dev_WARN(dev, format, arg...) \
-       WARN(1, "%s %s: " format, dev_driver_string(dev), dev_name(dev), ## arg);
+#define dev_WARN(dev, condition, format, arg...)               \
+       WARN(condition, "%s %s: " format,                       \
+                       dev_driver_string(dev), dev_name(dev), ## arg)
 
 #define dev_WARN_ONCE(dev, condition, format, arg...) \
        WARN_ONCE(condition, "%s %s: " format, \