aboutsummaryrefslogtreecommitdiffstats
path: root/package/kernel/mac80211/patches/805-b43-gpio-mask-module-option.patch
diff options
context:
space:
mode:
authorRafał Miłecki <zajec5@gmail.com>2015-11-16 06:55:38 +0000
committerRafał Miłecki <zajec5@gmail.com>2015-11-16 06:55:38 +0000
commitb2dab45aa776f8cacef8606af05cc657c8f99323 (patch)
tree9cddf12960f3ea2bf6f4ce656572fb7301cc8c5e /package/kernel/mac80211/patches/805-b43-gpio-mask-module-option.patch
parentd42669bf330fab4249c0feb33ae7894a7c935a35 (diff)
downloadupstream-b2dab45aa776f8cacef8606af05cc657c8f99323.tar.gz
upstream-b2dab45aa776f8cacef8606af05cc657c8f99323.tar.bz2
upstream-b2dab45aa776f8cacef8606af05cc657c8f99323.zip
kernel: backport ssb changes from 4.4-rc1
Signed-off-by: Rafał Miłecki <zajec5@gmail.com> SVN-Revision: 47483
Diffstat (limited to 'package/kernel/mac80211/patches/805-b43-gpio-mask-module-option.patch')
-rw-r--r--package/kernel/mac80211/patches/805-b43-gpio-mask-module-option.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/package/kernel/mac80211/patches/805-b43-gpio-mask-module-option.patch b/package/kernel/mac80211/patches/805-b43-gpio-mask-module-option.patch
index 3993c6e8de..6de31dd60f 100644
--- a/package/kernel/mac80211/patches/805-b43-gpio-mask-module-option.patch
+++ b/package/kernel/mac80211/patches/805-b43-gpio-mask-module-option.patch
@@ -10,7 +10,7 @@
struct b43_phy phy;
--- a/drivers/net/wireless/b43/main.c
+++ b/drivers/net/wireless/b43/main.c
-@@ -76,6 +76,11 @@ MODULE_FIRMWARE("b43/ucode16_mimo.fw");
+@@ -75,6 +75,11 @@ MODULE_FIRMWARE("b43/ucode16_mimo.fw");
MODULE_FIRMWARE("b43/ucode5.fw");
MODULE_FIRMWARE("b43/ucode9.fw");
@@ -22,7 +22,7 @@
static int modparam_bad_frames_preempt;
module_param_named(bad_frames_preempt, modparam_bad_frames_preempt, int, 0444);
MODULE_PARM_DESC(bad_frames_preempt,
-@@ -2883,10 +2888,10 @@ static int b43_gpio_init(struct b43_wlde
+@@ -2882,10 +2887,10 @@ static int b43_gpio_init(struct b43_wlde
u32 mask, set;
b43_maskset32(dev, B43_MMIO_MACCTL, ~B43_MACCTL_GPOUTSMSK, 0);