b43: Make probing of NPHY devices possible.

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@10487 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/package/b43/Makefile b/package/b43/Makefile
index 968eb0afd84f6ee230c8fe72b9eaebb8ef780825..3d5eb264c2dad0b2869a0e7f623767c0c1408a67 100644 (file)
--- 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 1a2141dabdc7a533cb9382773b674ddbe7a270bd..d105fcd1a70dce0feb6b90b7d3902a3a9afd3ad5 100644 (file)
--- 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 f145d8a4cfdeb0b629f5d36f7e64df3007db181b..1a31f7a72848d0cb8329c95c73b94f18efe27b51 100644 (file)
--- 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);