diff options
| author | John W. Linville <linville@tuxdriver.com> | 2014-05-16 14:16:17 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2014-05-16 14:16:17 -0400 |
| commit | d91a48cbae4cc12f6e8a65372a73ecf46f8f1b7f (patch) | |
| tree | 3b5e1c94e6aca1d132491ade8d033733ab06e328 /drivers/net/wireless/iwlwifi/iwl-debug.c | |
| parent | 75e58071c0c64f331ccc4c0037990a1e50099f7f (diff) | |
| parent | af7c603eb476216f1c27d82b802f0ce879c54ab3 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-debug.c')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-debug.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-debug.c b/drivers/net/wireless/iwlwifi/iwl-debug.c index 8a44f594528d..09feff4fa226 100644 --- a/drivers/net/wireless/iwlwifi/iwl-debug.c +++ b/drivers/net/wireless/iwlwifi/iwl-debug.c @@ -61,8 +61,6 @@ * *****************************************************************************/ -#define DEBUG - #include <linux/device.h> #include <linux/interrupt.h> #include <linux/export.h> @@ -128,8 +126,8 @@ void __iwl_dbg(struct device *dev, #ifdef CONFIG_IWLWIFI_DEBUG if (iwl_have_debug_level(level) && (!limit || net_ratelimit())) - dev_dbg(dev, "%c %s %pV", in_interrupt() ? 'I' : 'U', - function, &vaf); + dev_printk(KERN_DEBUG, dev, "%c %s %pV", + in_interrupt() ? 'I' : 'U', function, &vaf); #endif trace_iwlwifi_dbg(level, in_interrupt(), function, &vaf); va_end(args); |