From d2183006c8f8d85b9321d96c6cbd07b9356660eb Mon Sep 17 00:00:00 2001
From: Johannes Berg <johannes.berg@intel.com>
Date: Thu, 28 Jun 2012 18:45:38 +0200
Subject: [PATCH] --- yaml --- r: 315224 b: refs/heads/master c:
 346c265a48169d73a69c88ce9d6b65e6bb3b1f20 h: refs/heads/master v: v3

---
 [refs]                                         | 2 +-
 trunk/drivers/net/wireless/iwlwifi/iwl-debug.c | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index b70c68f8fba4..84bb454e1678 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d6f1c316346c95b0a280954d5afca29459921a24
+refs/heads/master: 346c265a48169d73a69c88ce9d6b65e6bb3b1f20
diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl-debug.c b/trunk/drivers/net/wireless/iwlwifi/iwl-debug.c
index 0f8fcd1d4fe2..87535a67de76 100644
--- a/trunk/drivers/net/wireless/iwlwifi/iwl-debug.c
+++ b/trunk/drivers/net/wireless/iwlwifi/iwl-debug.c
@@ -61,6 +61,9 @@
  *
  *****************************************************************************/
 
+#define DEBUG
+
+#include <linux/device.h>
 #include <linux/interrupt.h>
 #include <linux/export.h>
 #include "iwl-debug.h"
@@ -124,7 +127,7 @@ void __iwl_dbg(struct device *dev,
 #ifdef CONFIG_IWLWIFI_DEBUG
 	if (iwl_have_debug_level(level) &&
 	    (!limit || net_ratelimit()))
-		dev_err(dev, "%c %s %pV", in_interrupt() ? 'I' : 'U',
+		dev_dbg(dev, "%c %s %pV", in_interrupt() ? 'I' : 'U',
 			function, &vaf);
 #endif
 	trace_iwlwifi_dbg(level, in_interrupt(), function, &vaf);