aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm47xx/patches-3.3/980-wnr834b_no_cardbus_invariant.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@openwrt.org>2012-10-25 14:33:47 +0000
committerHauke Mehrtens <hauke@openwrt.org>2012-10-25 14:33:47 +0000
commit183c8129ef4ca3a21994a111118fa12fd9e782d2 (patch)
treebbbcac3fb6d358126698f3764c562345b210dc9c /target/linux/brcm47xx/patches-3.3/980-wnr834b_no_cardbus_invariant.patch
parent1e4b9a79ca1101e33c630e1d0b53611e01baba38 (diff)
downloadupstream-183c8129ef4ca3a21994a111118fa12fd9e782d2.tar.gz
upstream-183c8129ef4ca3a21994a111118fa12fd9e782d2.tar.bz2
upstream-183c8129ef4ca3a21994a111118fa12fd9e782d2.zip
kernel: update bcma and ssb to master-2012-10-18 from wireless-testing
* update the flash driver for bcm47xx to use the stubs already in bcma * do some misc enhancements to the flash drivers for bcm47xx git-svn-id: svn://svn.openwrt.org/openwrt/trunk@33920 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/brcm47xx/patches-3.3/980-wnr834b_no_cardbus_invariant.patch')
-rw-r--r--target/linux/brcm47xx/patches-3.3/980-wnr834b_no_cardbus_invariant.patch2
1 files changed, 1 insertions, 1 deletions
diff --git a/target/linux/brcm47xx/patches-3.3/980-wnr834b_no_cardbus_invariant.patch b/target/linux/brcm47xx/patches-3.3/980-wnr834b_no_cardbus_invariant.patch
index 7626c62abc..1c0c6195e8 100644
--- a/target/linux/brcm47xx/patches-3.3/980-wnr834b_no_cardbus_invariant.patch
+++ b/target/linux/brcm47xx/patches-3.3/980-wnr834b_no_cardbus_invariant.patch
@@ -1,6 +1,6 @@
--- a/arch/mips/bcm47xx/setup.c
+++ b/arch/mips/bcm47xx/setup.c
-@@ -151,6 +151,10 @@ static int bcm47xx_get_invariants(struct
+@@ -120,6 +120,10 @@ static int bcm47xx_get_invariants(struct
if (nvram_getenv("cardbus", buf, sizeof(buf)) >= 0)
iv->has_cardbus_slot = !!simple_strtoul(buf, NULL, 10);