aboutsummaryrefslogtreecommitdiffstats
path: root/package/mac80211/patches/120-pr_fmt_warnings.patch
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2011-02-27 11:22:26 +0000
committerFelix Fietkau <nbd@openwrt.org>2011-02-27 11:22:26 +0000
commitebff4e71daea8fb52e38c353c4bdf0940d891d13 (patch)
treeffaf70f51387dc2854aba4afdffcc2171ab25345 /package/mac80211/patches/120-pr_fmt_warnings.patch
parent67cb2739eb59feba7f3eeebb5527090ae1f1bfbb (diff)
downloadupstream-ebff4e71daea8fb52e38c353c4bdf0940d891d13.tar.gz
upstream-ebff4e71daea8fb52e38c353c4bdf0940d891d13.tar.bz2
upstream-ebff4e71daea8fb52e38c353c4bdf0940d891d13.zip
mac80211: update to 2011-02-25
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@25749 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/mac80211/patches/120-pr_fmt_warnings.patch')
-rw-r--r--package/mac80211/patches/120-pr_fmt_warnings.patch14
1 files changed, 12 insertions, 2 deletions
diff --git a/package/mac80211/patches/120-pr_fmt_warnings.patch b/package/mac80211/patches/120-pr_fmt_warnings.patch
index e080af7099..595c6b7de1 100644
--- a/package/mac80211/patches/120-pr_fmt_warnings.patch
+++ b/package/mac80211/patches/120-pr_fmt_warnings.patch
@@ -8,8 +8,8 @@
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include <linux/kernel.h>
---- a/drivers/net/wireless/iwlwifi/iwl3945-base.c
-+++ b/drivers/net/wireless/iwlwifi/iwl3945-base.c
+--- a/drivers/net/wireless/iwlegacy/iwl3945-base.c
++++ b/drivers/net/wireless/iwlegacy/iwl3945-base.c
@@ -27,6 +27,7 @@
*
*****************************************************************************/
@@ -88,3 +88,13 @@
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include <linux/kernel.h>
+--- a/drivers/net/wireless/iwlegacy/iwl4965-base.c
++++ b/drivers/net/wireless/iwlegacy/iwl4965-base.c
+@@ -27,6 +27,7 @@
+ *
+ *****************************************************************************/
+
++#undef pr_fmt
+ #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
+ #include <linux/kernel.h>