Add intel and iwlwifi group drivers for driver-select

Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>

diff --git a/Makefile b/Makefile
index ab97de0591a2c8edf28fd538362624b0877541d6..c1c3fb382289d7972c8fd3a615c6f25e70d866cd 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -22,9 +22,6 @@ NOSTDINC_FLAGS := -I$(M)/include/ -include $(M)/include/net/compat.h $(CFLAGS)
 obj-y := net/wireless/ net/mac80211/ net/rfkill/
 ifeq ($(ONLY_CORE),)
 obj-m += \
-       drivers/ssb/ \
-       drivers/misc/eeprom/ \
-       drivers/net/usb/ \
        drivers/net/wireless/
 endif
 

diff --git a/scripts/driver-select b/scripts/driver-select
index e6f2ec32b77a65e3a000e81dedf302a8d4cb485e..6e31fa09a5408dba9472c46e0d27ed9dea49f5d5 100755 (executable)
--- a/scripts/driver-select
+++ b/scripts/driver-select
@@ -40,7 +40,8 @@ function usage {
        echo -e "Supported group drivers:"
        echo -e "\t${CYAN}atheros${NORMAL} < ${PURPLE} ath5k ath9k ar9170 zd1211rw ${NORMAL}>"
        echo -e "\t${CYAN}ath${NORMAL} < ${PURPLE} ath5k ath9k ar9170 ${NORMAL}>"
-       #echo -e "\t${CYAN}iwlwifi${NORMAL} < ${PURPLE} iwl3945 iwlagn${NORMAL}>"
+       echo -e "\t${CYAN}intel${NORMAL} < ${PURPLE} iwl3945 iwlagn ipw2100 ipw2200 ${NORMAL}>"
+       echo -e "\t${CYAN}iwlwifi${NORMAL} < ${PURPLE} iwl3945 iwlagn ${NORMAL}>"
 
        echo -e "Restoring compat-wireless:"
        echo -e "\t${GREEN}restore${NORMAL}: you can use this option to restore compat-wireless to the original state"
@@ -79,7 +80,6 @@ function select_drivers
                        CONFIGS="${CONFIGS}|$i"
                fi
        done
-       echo -e "Configs: $CONFIGS"
        egrep "$CONFIGS" $DRIVERS_MAKEFILE > ${DRIVERS_MAKEFILE}.tmp
        mv ${DRIVERS_MAKEFILE}.tmp ${DRIVERS_MAKEFILE}
 }
@@ -113,13 +113,17 @@ function disable_usbnet
        perl -i -ne 'print if ! /drivers\/net\/usb\/ \\/' Makefile
 }
 
-function disable_var_01 {
-       disable_lib80211
+function disable_var {
        disable_ssb
        disable_usbnet
        disable_eeprom
 } 
 
+function disable_var_01 {
+       disable_lib80211
+       disable_var
+}
+
 function select_ath_driver 
 {
        backup_file $ATH_MAKEFILE
@@ -195,6 +199,15 @@ case $1 in
                select_drivers          CONFIG_ATH_COMMON
                disable_var_01
                ;;
+       intel)
+               select_drivers          CONFIG_IWLWIFI \
+                                       CONFIG_IPW
+               disable_var
+               ;;
+       iwlwifi)
+               select_driver           CONFIG_IWLWIFI
+               disable_var_01
+               ;;
        ath5k)
                select_driver           CONFIG_ATH_COMMON
                select_ath_driver       CONFIG_ATH5K