From fcc2fef67b978ebe965b4d4b21a345630f883e3b Mon Sep 17 00:00:00 2001 From: Larry Finger Date: Sun, 10 Aug 2008 10:19:33 -0500 Subject: [PATCH] --- yaml --- r: 108831 b: refs/heads/master c: a58d452290aafae30b021c8bf185853b1aaf2092 h: refs/heads/master i: 108829: 26a70866f99d0f632c99e2d00f937d494c169fca 108827: bf31d49060d756eb14b558466b6f10e1ddaebd70 108823: 64f10ca67b38a5525603fcf62ab342815b2ff293 108815: fee289beb48c8102c987d0c7d66d80b56a7c9cd6 108799: b3dd26fe354d7a61876f38cd6b7b4ba9a0a38a0c v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/b43/main.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index cf916fd2d6b7..a3987c4172a8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a61dae1f784f0c4ced0d47721c0efc7033231522 +refs/heads/master: a58d452290aafae30b021c8bf185853b1aaf2092 diff --git a/trunk/drivers/net/wireless/b43/main.c b/trunk/drivers/net/wireless/b43/main.c index 3bf3a869361f..ee462b514104 100644 --- a/trunk/drivers/net/wireless/b43/main.c +++ b/trunk/drivers/net/wireless/b43/main.c @@ -4616,6 +4616,7 @@ static void b43_sprom_fixup(struct ssb_bus *bus) pdev = bus->host_pci; if (IS_PDEV(pdev, BROADCOM, 0x4318, ASUSTEK, 0x100F) || IS_PDEV(pdev, BROADCOM, 0x4320, LINKSYS, 0x0015) || + IS_PDEV(pdev, BROADCOM, 0x4320, LINKSYS, 0x0014) || IS_PDEV(pdev, BROADCOM, 0x4320, LINKSYS, 0x0013)) bus->sprom.boardflags_lo &= ~B43_BFL_BTCOEXIST; }