[1/4,v2] compat-wireless: update bluetooth in Makefile

Commit Message

Walter Goldens Oct. 21, 2010, 6:33 a.m. UTC

None

Patch

--- a/Makefile
+++ b/Makefile
@@ -93,19 +93,32 @@  bt-install-modules: bt
 	@echo
 	@echo "Currently detected bluetooth subsystem modules:"
 	@echo
-	@$(MODPROBE) -l sco
-	@$(MODPROBE) -l l2cap
-	@$(MODPROBE) -l hidp
-	@$(MODPROBE) -l rfcomm
+	@$(MODPROBE) -l ath3k       
+	@$(MODPROBE) -l bcm203x
+	@$(MODPROBE) -l bluecard_cs
+	@$(MODPROBE) -l bluetooth
 	@$(MODPROBE) -l bnep
+	@$(MODPROBE) -l bpa10x
+	@$(MODPROBE) -l bt3c_cs
+	@$(MODPROBE) -l btmrvl
+	@$(MODPROBE) -l btmrvl_sdio
+	@$(MODPROBE) -l btsdio
 	@$(MODPROBE) -l btusb
-	@$(MODPROBE) -l bluetooth
+	@$(MODPROBE) -l btuart_cs
+	@$(MODPROBE) -l	cmtp
+	@$(MODPROBE) -l	dtl1_cs
+	@$(MODPROBE) -l hidp
+	@$(MODPROBE) -l	hci_vhci
+	@$(MODPROBE) -l	hci_uart
+	@$(MODPROBE) -l l2cap
+	@$(MODPROBE) -l rfcomm
+	@$(MODPROBE) -l sco
 	@echo
 	@echo Now run:
 	@echo
 	@echo sudo make btunload:
 	@echo
-	@echo And the load the needed bluetooth modules. If unsure reboot.
+	@echo And then load the needed bluetooth modules. If unsure reboot.
 	@echo
 
 btuninstall:
@@ -118,14 +131,26 @@  btuninstall:
 	@echo
 	@echo "Your old bluetooth subsystem modules were left intact:"
 	@echo
-	@$(MODPROBE) -l sco
-	@$(MODPROBE) -l l2cap
-	@$(MODPROBE) -l hidp
-	@$(MODPROBE) -l rfcomm
+	@$(MODPROBE) -l ath3k       
+	@$(MODPROBE) -l bcm203x
+	@$(MODPROBE) -l bluecard_cs
+	@$(MODPROBE) -l bluetooth
 	@$(MODPROBE) -l bnep
+	@$(MODPROBE) -l bpa10x
+	@$(MODPROBE) -l bt3c_cs
+	@$(MODPROBE) -l btmrvl
+	@$(MODPROBE) -l btmrvl_sdio
+	@$(MODPROBE) -l btsdio
 	@$(MODPROBE) -l btusb
-	@$(MODPROBE) -l bluetooth
-	@
+	@$(MODPROBE) -l btuart_cs
+	@$(MODPROBE) -l	cmtp
+	@$(MODPROBE) -l	dtl1_cs
+	@$(MODPROBE) -l hidp
+	@$(MODPROBE) -l	hci_vhci
+	@$(MODPROBE) -l	hci_uart
+	@$(MODPROBE) -l l2cap
+	@$(MODPROBE) -l rfcomm
+	@$(MODPROBE) -l sco
 	@echo
 
 btclean:
@@ -263,22 +288,35 @@  install-scripts:
 	@echo
 	@echo "Currently detected bluetooth subsystem modules:"
 	@echo
-	@$(MODPROBE) -l sco
-	@$(MODPROBE) -l l2cap
-	@$(MODPROBE) -l hidp
-	@$(MODPROBE) -l rfcomm
+	@$(MODPROBE) -l ath3k           
+	@$(MODPROBE) -l bcm203x
+	@$(MODPROBE) -l bluecard_cs
+	@$(MODPROBE) -l bluetooth
 	@$(MODPROBE) -l bnep
+	@$(MODPROBE) -l bpa10x
+	@$(MODPROBE) -l bt3c_cs
+	@$(MODPROBE) -l btmrvl
+	@$(MODPROBE) -l btmrvl_sdio
+	@$(MODPROBE) -l btsdio
 	@$(MODPROBE) -l btusb
-	@$(MODPROBE) -l bluetooth
+	@$(MODPROBE) -l btuart_cs
+	@$(MODPROBE) -l	cmtp
+	@$(MODPROBE) -l	dtl1_cs
+	@$(MODPROBE) -l hidp
+	@$(MODPROBE) -l	hci_vhci
+	@$(MODPROBE) -l	hci_uart
+	@$(MODPROBE) -l l2cap
+	@$(MODPROBE) -l rfcomm
+	@$(MODPROBE) -l sco
 	@echo 
 	@echo Now run:
 	@echo 
-	@echo sudo make unload to unload both wireless and bluetooth modules
+	@echo sudo make unload to unload all: wireless, bluetooth and ethernet modules
 	@echo sudo make wlunload to unload wireless modules
 	@echo sudo make btunload to unload bluetooth modules
 	@echo
-	@echo And then load the wireless or bluetooth module you need. If unsure reboot.
-	@echo Alternatively use "sudo make load/wlload/btload" to load modules
+	@echo Run sudo modprobe 'driver-name' to load your desired driver. 
+	@echo If unsure reboot.
 	@echo
 
 uninstall:
@@ -379,13 +417,26 @@  uninstall:
 	@echo
 	@echo "Your old bluetooth subsystem modules were left intact:"
 	@echo
-	@$(MODPROBE) -l sco
-	@$(MODPROBE) -l l2cap
-	@$(MODPROBE) -l hidp
-	@$(MODPROBE) -l rfcomm
+	@$(MODPROBE) -l ath3k           
+	@$(MODPROBE) -l bcm203x
+	@$(MODPROBE) -l bluecard_cs
+	@$(MODPROBE) -l bluetooth
 	@$(MODPROBE) -l bnep
+	@$(MODPROBE) -l bpa10x
+	@$(MODPROBE) -l bt3c_cs
+	@$(MODPROBE) -l btmrvl
+	@$(MODPROBE) -l btmrvl_sdio
+	@$(MODPROBE) -l btsdio
 	@$(MODPROBE) -l btusb
-	@$(MODPROBE) -l bluetooth
+	@$(MODPROBE) -l btuart_cs
+	@$(MODPROBE) -l	cmtp
+	@$(MODPROBE) -l	dtl1_cs
+	@$(MODPROBE) -l hidp
+	@$(MODPROBE) -l	hci_vhci
+	@$(MODPROBE) -l	hci_uart
+	@$(MODPROBE) -l l2cap
+	@$(MODPROBE) -l rfcomm
+	@$(MODPROBE) -l sco
 	@
 	@echo 
 
@@ -397,22 +448,14 @@  clean:
 unload:
 	@./scripts/unload.sh
 
-load: unload
-	@./scripts/load.sh
-
 btunload:
 	@./scripts/btunload.sh
 
-btload: btunload
-	@./scripts/btload.sh
-
 wlunload:
 	@./scripts/wlunload.sh
 
-wlload: wlunload
-	@./scripts/wlload.sh
 
-.PHONY: all clean install uninstall unload load btunload btload wlunload wlload modules bt
+.PHONY: all clean install uninstall unload btunload wlunload modules bt
 
 endif