diff options
author | Alexey Zaytsev <alexey.zaytsev@gmail.com> | 2008-02-23 04:59:26 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2008-02-28 09:13:10 -0500 |
commit | c7084535c9d2b8bcfc19f1ad9452eabde742ae22 (patch) | |
tree | 7009424c631c13a7a4675892f124073059255323 /drivers/net/wireless | |
parent | 4b7524a42e14a7f86fa12611f3419650e99e2526 (diff) |
Use a separate config option for the b43 pci to ssb bridge.
The bridge code was unnecessary enabled by the b44
driver, but it prevents the bcm43xx driver from
being loaded, as the bridge claims the same pci ids.
Now we enable the birdge only if the b43{legacy}
drivers are selected.
Signed-off-by: Alexey Zaytsev <alexey.zaytsev@gmail.com>
Acked-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless')
-rw-r--r-- | drivers/net/wireless/b43/Kconfig | 1 | ||||
-rw-r--r-- | drivers/net/wireless/b43legacy/Kconfig | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/wireless/b43/Kconfig b/drivers/net/wireless/b43/Kconfig index 1a2141dabdc7..8bc4bc4c330e 100644 --- a/drivers/net/wireless/b43/Kconfig +++ b/drivers/net/wireless/b43/Kconfig | |||
@@ -32,6 +32,7 @@ config B43_PCI_AUTOSELECT | |||
32 | bool | 32 | bool |
33 | depends on B43 && SSB_PCIHOST_POSSIBLE | 33 | depends on B43 && SSB_PCIHOST_POSSIBLE |
34 | select SSB_PCIHOST | 34 | select SSB_PCIHOST |
35 | select SSB_B43_PCI_BRIDGE | ||
35 | default y | 36 | default y |
36 | 37 | ||
37 | # Auto-select SSB PCICORE driver, if possible | 38 | # Auto-select SSB PCICORE driver, if possible |
diff --git a/drivers/net/wireless/b43legacy/Kconfig b/drivers/net/wireless/b43legacy/Kconfig index 6745579ba96d..13c65faf0247 100644 --- a/drivers/net/wireless/b43legacy/Kconfig +++ b/drivers/net/wireless/b43legacy/Kconfig | |||
@@ -25,6 +25,7 @@ config B43LEGACY_PCI_AUTOSELECT | |||
25 | bool | 25 | bool |
26 | depends on B43LEGACY && SSB_PCIHOST_POSSIBLE | 26 | depends on B43LEGACY && SSB_PCIHOST_POSSIBLE |
27 | select SSB_PCIHOST | 27 | select SSB_PCIHOST |
28 | select SSB_B43_PCI_BRIDGE | ||
28 | default y | 29 | default y |
29 | 30 | ||
30 | # Auto-select SSB PCICORE driver, if possible | 31 | # Auto-select SSB PCICORE driver, if possible |