aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorJohannes Berg <johannes@sipsolutions.net>2008-12-24 06:44:09 -0500
committerJohn W. Linville <linville@tuxdriver.com>2009-01-29 15:59:37 -0500
commit92d6128e1766bb7a7b6dc58f012fdf772fdf1100 (patch)
tree1de820cdd7496f6eacf965a9705cb23a484e0b6d /drivers
parente3c92df08cbf6a0cb60a9c7ce377378383967e07 (diff)
ssb/b43: add new N PHY device
This is used on my macbook. N PHY, obviously nothing works yet, but we can detect the chip with this patch. Signed-off-by: Johannes Berg <johannes@sipsolutions.net> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/wireless/b43/main.c1
-rw-r--r--drivers/ssb/b43_pci_bridge.c1
2 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c
index ba989ae132a..a2b1e375f83 100644
--- a/drivers/net/wireless/b43/main.c
+++ b/drivers/net/wireless/b43/main.c
@@ -97,6 +97,7 @@ static const struct ssb_device_id b43_ssb_tbl[] = {
97 SSB_DEVICE(SSB_VENDOR_BROADCOM, SSB_DEV_80211, 10), 97 SSB_DEVICE(SSB_VENDOR_BROADCOM, SSB_DEV_80211, 10),
98 SSB_DEVICE(SSB_VENDOR_BROADCOM, SSB_DEV_80211, 11), 98 SSB_DEVICE(SSB_VENDOR_BROADCOM, SSB_DEV_80211, 11),
99 SSB_DEVICE(SSB_VENDOR_BROADCOM, SSB_DEV_80211, 13), 99 SSB_DEVICE(SSB_VENDOR_BROADCOM, SSB_DEV_80211, 13),
100 SSB_DEVICE(SSB_VENDOR_BROADCOM, SSB_DEV_80211, 16),
100 SSB_DEVTABLE_END 101 SSB_DEVTABLE_END
101}; 102};
102 103
diff --git a/drivers/ssb/b43_pci_bridge.c b/drivers/ssb/b43_pci_bridge.c
index 2d27d6d6d08..6433a7ed39f 100644
--- a/drivers/ssb/b43_pci_bridge.c
+++ b/drivers/ssb/b43_pci_bridge.c
@@ -29,6 +29,7 @@ static const struct pci_device_id b43_pci_bridge_tbl[] = {
29 { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4325) }, 29 { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4325) },
30 { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4328) }, 30 { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4328) },
31 { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4329) }, 31 { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4329) },
32 { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x432b) },
32 { 0, }, 33 { 0, },
33}; 34};
34MODULE_DEVICE_TABLE(pci, b43_pci_bridge_tbl); 35MODULE_DEVICE_TABLE(pci, b43_pci_bridge_tbl);