[PATCH] compat-drivers: do not disable bcma when selecting brcmsmac

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



The brcmsmac driver depends on the bcma bus driver these days. However,
the driver-select script disabled bcma when selecting brcmsmac (or
the brcm80211 driver group). This leads to mismatch between kernel
bcma and backport brcmsmac. For the 3.9 backport this result in:

[10298.323094] brcmsmac: Unknown symbol bcma_pmu_spuravoid_pllupdate (err 0)

as this function was added to bcma.

Signed-off-by: Arend van Spriel <arend@xxxxxxxxxxxx>
---
 scripts/driver-select |   11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/scripts/driver-select b/scripts/driver-select
index 862f43b..c6afdfc 100755
--- a/scripts/driver-select
+++ b/scripts/driver-select
@@ -408,7 +408,10 @@ case $1 in
 		;;
 	brcm80211)
 		disable_staging
-		disable_bt_usb_ethernet_var
+		disable_bt_usb_ethernet
+		disable_ssb
+		disable_eeprom
+		disable_lib80211
 		select_drivers		CONFIG_BRCMUTIL \
 					CONFIG_BRCMFMAC \
 					CONFIG_BRCMSMAC
@@ -465,13 +468,17 @@ case $1 in
 		;;
 	brcmsmac)
 		disable_staging
-		disable_bt_usb_ethernet_var
+		disable_bt_usb_ethernet
+		disable_ssb
+		disable_eeprom
+		disable_lib80211
 		select_drivers		CONFIG_BRCMSMAC
 		select_brcm80211_driver	CONFIG_BRCMSMAC CONFIG_BRCMUTIL
 		;;
 	brcmfmac)
 		disable_staging
 		disable_bt_usb_ethernet_var
+		disable_lib80211
 		select_drivers		CONFIG_BRCMFMAC
 		select_brcm80211_driver	CONFIG_BRCMFMAC CONFIG_BRCMUTIL
 		;;
-- 
1.7.10.4


--
To unsubscribe from this list: send the line "unsubscribe backports" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html




[Index of Archives]     [Linux ARM Kernel]     [Linux ARM]     [Linux Omap]     [Fedora ARM]     [IETF Annouce]     [Security]     [Bugtraq]     [Linux]     [Linux OMAP]     [Linux MIPS]     [ECOS]     [Asterisk Internet PBX]     [Linux API]

  Powered by Linux