kernel: update bcma and ssb to master-2012-10-18 from wireless-testing
[openwrt.git] / target / linux / brcm47xx / patches-3.3 / 980-wnr834b_no_cardbus_invariant.patch
1 --- a/arch/mips/bcm47xx/setup.c
2 +++ b/arch/mips/bcm47xx/setup.c
3 @@ -120,6 +120,10 @@ static int bcm47xx_get_invariants(struct
4         if (nvram_getenv("cardbus", buf, sizeof(buf)) >= 0)
5                 iv->has_cardbus_slot = !!simple_strtoul(buf, NULL, 10);
6  
7 +       /* Do not indicate cardbus for Netgear WNR834B V1 and V2 */
8 +       if (iv->boardinfo.type == 0x0472 && iv->has_cardbus_slot)
9 +               iv->has_cardbus_slot = 0;
10 +
11         return 0;
12  }
13