summaryrefslogtreecommitdiff
path: root/patches/collateral-evolutions/network/15-symbol-export-conflicts.patch
diff options
context:
space:
mode:
authorLuis R. Rodriguez <mcgrof@do-not-panic.com>2012-12-14 11:01:18 -0800
committerLuis R. Rodriguez <mcgrof@do-not-panic.com>2012-12-14 11:01:18 -0800
commit38fff141859fe1fa341114fb51d775e4136b287e (patch)
tree3d7449300165cb3210ecc90a4d4aa5f8efa4483f /patches/collateral-evolutions/network/15-symbol-export-conflicts.patch
parent953ea3b49eed50f46d13a6f74e9f9334bff6f0cf (diff)
compat-drivers: refresh patches for next-20121214
Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>
Diffstat (limited to 'patches/collateral-evolutions/network/15-symbol-export-conflicts.patch')
-rw-r--r--patches/collateral-evolutions/network/15-symbol-export-conflicts.patch2
1 files changed, 1 insertions, 1 deletions
diff --git a/patches/collateral-evolutions/network/15-symbol-export-conflicts.patch b/patches/collateral-evolutions/network/15-symbol-export-conflicts.patch
index 9b6d36eb..6cfefbb1 100644
--- a/patches/collateral-evolutions/network/15-symbol-export-conflicts.patch
+++ b/patches/collateral-evolutions/network/15-symbol-export-conflicts.patch
@@ -3,7 +3,7 @@ To avoid conflicts with the other export we rename our.
--- a/net/mac80211/rx.c
+++ b/net/mac80211/rx.c
-@@ -3243,7 +3243,12 @@ void ieee80211_rx(struct ieee80211_hw *h
+@@ -3244,7 +3244,12 @@ void ieee80211_rx(struct ieee80211_hw *h
drop:
kfree_skb(skb);
}