summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormb <mb@3c298f89-4303-0410-b956-a3cf2f4a3e73>2008-02-18 22:21:29 +0000
committermb <mb@3c298f89-4303-0410-b956-a3cf2f4a3e73>2008-02-18 22:21:29 +0000
commitbdf17f190b2849d9afde2855600b04ec0ffcc811 (patch)
treef2417d2e9413dca6314fc9bfdf1ca65cee4c4495
parent8e3a5f9732483c2e6ce4e26f5fe588e59be7621f (diff)
b43: Make probing of NPHY devices possible.
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@10487 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--package/b43/Makefile1
-rw-r--r--package/b43/src/Kconfig2
-rw-r--r--target/linux/generic-2.6/files/drivers/ssb/b43_pci_bridge.c2
3 files changed, 4 insertions, 1 deletions
diff --git a/package/b43/Makefile b/package/b43/Makefile
index 968eb0afd8..3d5eb264c2 100644
--- a/package/b43/Makefile
+++ b/package/b43/Makefile
@@ -43,6 +43,7 @@ endef
EXTRA_KCONFIG:= \
CONFIG_B43=m \
+ CONFIG_B43_NPHY=y \
$(if $(CONFIG_LEDS_TRIGGERS),CONFIG_B43_LEDS=y) \
diff --git a/package/b43/src/Kconfig b/package/b43/src/Kconfig
index 1a2141dabd..d105fcd1a7 100644
--- a/package/b43/src/Kconfig
+++ b/package/b43/src/Kconfig
@@ -63,7 +63,7 @@ config B43_PCMCIA
config B43_NPHY
bool "Pre IEEE 802.11n support (BROKEN)"
- depends on B43 && EXPERIMENTAL && BROKEN
+ depends on B43 && EXPERIMENTAL
---help---
Support for the IEEE 802.11n draft.
diff --git a/target/linux/generic-2.6/files/drivers/ssb/b43_pci_bridge.c b/target/linux/generic-2.6/files/drivers/ssb/b43_pci_bridge.c
index f145d8a4cf..1a31f7a728 100644
--- a/target/linux/generic-2.6/files/drivers/ssb/b43_pci_bridge.c
+++ b/target/linux/generic-2.6/files/drivers/ssb/b43_pci_bridge.c
@@ -27,6 +27,8 @@ static const struct pci_device_id b43_pci_bridge_tbl[] = {
{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4321) },
{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4324) },
{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4325) },
+ { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4328) },
+ { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4329) },
{ 0, },
};
MODULE_DEVICE_TABLE(pci, b43_pci_bridge_tbl);