From 41c129a2ca799cb2536d24a91c4807831d76cd7e Mon Sep 17 00:00:00 2001 From: Johannes Berg Date: Mon, 15 Apr 2013 23:45:13 +0200 Subject: [PATCH] backports: remove iwlwifi dev_dbg() patch This is no longer needed since now the compat headers don't pre-include half the world any more. Signed-off-by: Johannes Berg --- .../network/57-iwlwifi-debug-fix/INFO | 5 ----- .../drivers_net_wireless_iwlwifi_iwl-debug.patch | 14 -------------- 2 files changed, 19 deletions(-) delete mode 100644 patches/collateral-evolutions/network/57-iwlwifi-debug-fix/INFO delete mode 100644 patches/collateral-evolutions/network/57-iwlwifi-debug-fix/drivers_net_wireless_iwlwifi_iwl-debug.patch diff --git a/patches/collateral-evolutions/network/57-iwlwifi-debug-fix/INFO b/patches/collateral-evolutions/network/57-iwlwifi-debug-fix/INFO deleted file mode 100644 index 98fdfd1a2874..000000000000 --- a/patches/collateral-evolutions/network/57-iwlwifi-debug-fix/INFO +++ /dev/null @@ -1,5 +0,0 @@ -Due to compat including linux/device.h before we do, -we don't get a chance to #define DEBUG to get our -debugging prints. This patch replaces dev_dbg with -dev_printk to make them show up again. - diff --git a/patches/collateral-evolutions/network/57-iwlwifi-debug-fix/drivers_net_wireless_iwlwifi_iwl-debug.patch b/patches/collateral-evolutions/network/57-iwlwifi-debug-fix/drivers_net_wireless_iwlwifi_iwl-debug.patch deleted file mode 100644 index e5d395ac21f7..000000000000 --- a/patches/collateral-evolutions/network/57-iwlwifi-debug-fix/drivers_net_wireless_iwlwifi_iwl-debug.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- a/drivers/net/wireless/iwlwifi/iwl-debug.c -+++ b/drivers/net/wireless/iwlwifi/iwl-debug.c -@@ -139,8 +139,9 @@ void __iwl_dbg(struct device *dev, - - va_copy(args2, args); - vaf.va = &args2; -- 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); - va_end(args2); - } - #endif -- 2.30.2