kernel: make most modules use AutoProbe

now that we have modprobe we can set more than half of the modules to AutoProbe

Signed-off-by: John Crispin <blogic@openwrt.org>

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

1 files changed, 49 insertions, 59 deletions

diff --git a/package/kernel/mac80211/Makefile b/package/kernel/mac80211/Makefile
index 976fa6a168..0e36e2e3ec 100644
--- a/package/kernel/mac80211/Makefile
+++ b/package/kernel/mac80211/Makefile
@@ -63,7 +63,6 @@ define KernelPackage/cfg80211
   FILES:= \
 	$(PKG_BUILD_DIR)/compat/compat.ko \
 	$(PKG_BUILD_DIR)/net/wireless/cfg80211.ko
-  AUTOLOAD:=$(call AutoLoad,20,compat cfg80211)
 endef
 
 define KernelPackage/cfg80211/description
@@ -77,7 +76,6 @@ define KernelPackage/mac80211
   KCONFIG:=\
 	CONFIG_AVERAGE=y
   FILES:= $(PKG_BUILD_DIR)/net/mac80211/mac80211.ko
-  AUTOLOAD:=$(call AutoLoad,21,mac80211)
   MENU:=1
 endef
 
@@ -181,7 +179,6 @@ define KernelPackage/p54-common
   DEPENDS+= @PCI_SUPPORT||@USB_SUPPORT||@TARGET_omap24xx +kmod-mac80211 +kmod-lib-crc-ccitt
   TITLE+= (COMMON)
   FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/p54/p54common.ko
-  AUTOLOAD:=$(call AutoLoad,30,p54common)
 endef
 
 define KernelPackage/p54-pci
@@ -189,7 +186,7 @@ define KernelPackage/p54-pci
   TITLE+= (PCI)
   DEPENDS+= @PCI_SUPPORT +kmod-p54-common
   FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/p54/p54pci.ko
-  AUTOLOAD:=$(call AutoLoad,31,p54pci)
+  AUTOLOAD:=$(call AutoProbe,p54pci)
 endef
 
 define KernelPackage/p54-usb
@@ -197,7 +194,7 @@ define KernelPackage/p54-usb
   TITLE+= (USB)
   DEPENDS+= @USB_SUPPORT +kmod-usb-core +kmod-p54-common
   FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/p54/p54usb.ko
-  AUTOLOAD:=$(call AutoLoad,31,p54usb)
+  AUTOLOAD:=$(call AutoProbe,p54usb)
 endef
 
 define KernelPackage/p54-spi
@@ -205,7 +202,7 @@ define KernelPackage/p54-spi
   TITLE+= (SPI)
   DEPENDS+= @TARGET_omap24xx +kmod-p54-common
   FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/p54/p54spi.ko
-  AUTOLOAD:=$(call AutoLoad,31,p54spi)
+  AUTOLOAD:=$(call AutoProbe,p54spi)
 endef
 
 define KernelPackage/rt2x00/Default
@@ -218,7 +215,6 @@ $(call KernelPackage/rt2x00/Default)
   DEPENDS+= @(PCI_SUPPORT||USB_SUPPORT||TARGET_ramips) +kmod-mac80211 +kmod-lib-crc-itu-t
   TITLE+= (LIB)
   FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/rt2x00/rt2x00lib.ko
-  AUTOLOAD:=$(call AutoLoad,24,rt2x00lib)
   MENU:=1
 endef
 
@@ -246,7 +242,6 @@ $(call KernelPackage/rt2x00/Default)
   DEPENDS+= @(PCI_SUPPORT||TARGET_ramips) +kmod-rt2x00-lib +kmod-eeprom-93cx6
   TITLE+= (MMIO)
   FILES:= $(PKG_BUILD_DIR)/drivers/net/wireless/rt2x00/rt2x00mmio.ko
-  AUTOLOAD:=$(call AutoLoad,25,rt2x00mmio)
 endef
 
 define KernelPackage/rt2x00-pci
@@ -254,7 +249,7 @@ $(call KernelPackage/rt2x00/Default)
   DEPENDS+= @PCI_SUPPORT +kmod-rt2x00-mmio +kmod-rt2x00-lib
   TITLE+= (PCI)
   FILES:= $(PKG_BUILD_DIR)/drivers/net/wireless/rt2x00/rt2x00pci.ko
-  AUTOLOAD:=$(call AutoLoad,26,rt2x00pci)
+  AUTOLOAD:=$(call AutoProbe,rt2x00pci)
 endef
 
 define KernelPackage/rt2x00-usb
@@ -262,7 +257,7 @@ $(call KernelPackage/rt2x00/Default)
   DEPENDS+= @USB_SUPPORT +kmod-rt2x00-lib +kmod-usb-core
   TITLE+= (USB)
   FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/rt2x00/rt2x00usb.ko
-  AUTOLOAD:=$(call AutoLoad,26,rt2x00usb)
+  AUTOLOAD:=$(call AutoProbe,rt2x00usb)
 endef
 
 define KernelPackage/rt2x00-soc
@@ -270,7 +265,7 @@ $(call KernelPackage/rt2x00/Default)
   DEPENDS+=@TARGET_ramips_rt305x +kmod-rt2x00-mmio +kmod-rt2x00-lib
   TITLE+= (SoC)
   FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/rt2x00/rt2x00soc.ko
-  AUTOLOAD:=$(call AutoLoad,26,rt2x00soc)
+  AUTOLOAD:=$(call AutoProbe,rt2x00soc)
 endef
 
 define KernelPackage/rt2800-lib
@@ -278,7 +273,6 @@ $(call KernelPackage/rt2x00/Default)
   DEPENDS+= @(PCI_SUPPORT||USB_SUPPORT||TARGET_ramips) +kmod-rt2x00-lib +kmod-lib-crc-ccitt +@DRIVER_11N_SUPPORT
   TITLE+= (rt2800 LIB)
   FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/rt2x00/rt2800lib.ko
-  AUTOLOAD:=$(call AutoLoad,27,rt2800lib)
 endef
 
 define KernelPackage/rt2400-pci
@@ -286,7 +280,7 @@ $(call KernelPackage/rt2x00/Default)
   DEPENDS+= @PCI_SUPPORT +kmod-rt2x00-pci
   TITLE+= (RT2400 PCI)
   FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/rt2x00/rt2400pci.ko
-  AUTOLOAD:=$(call AutoLoad,27,rt2400pci)
+  AUTOLOAD:=$(call AutoProbe,rt2400pci)
 endef
 
 define KernelPackage/rt2500-pci
@@ -294,7 +288,7 @@ $(call KernelPackage/rt2x00/Default)
   DEPENDS+= @PCI_SUPPORT +kmod-rt2x00-pci
   TITLE+= (RT2500 PCI)
   FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/rt2x00/rt2500pci.ko
-  AUTOLOAD:=$(call AutoLoad,27,rt2500pci)
+  AUTOLOAD:=$(call AutoProbe,rt2500pci)
 endef
 
 define KernelPackage/rt2500-usb
@@ -302,7 +296,7 @@ $(call KernelPackage/rt2x00/Default)
   DEPENDS+= @USB_SUPPORT +kmod-rt2x00-usb
   TITLE+= (RT2500 USB)
   FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/rt2x00/rt2500usb.ko
-  AUTOLOAD:=$(call AutoLoad,27,rt2500usb)
+  AUTOLOAD:=$(call AutoProbe,rt2500usb)
 endef
 
 define KernelPackage/rt61-pci
@@ -310,7 +304,7 @@ $(call KernelPackage/rt2x00/Default)
   DEPENDS+= @PCI_SUPPORT +kmod-rt2x00-pci
   TITLE+= (RT2x61 PCI)
   FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/rt2x00/rt61pci.ko
-  AUTOLOAD:=$(call AutoLoad,27,rt61pci)
+  AUTOLOAD:=$(call AutoProbe,rt61pci)
 endef
 
 define KernelPackage/rt73-usb
@@ -318,7 +312,7 @@ define KernelPackage/rt73-usb
   DEPENDS+= @USB_SUPPORT +kmod-rt2x00-usb
   TITLE+= (RT73 USB)
   FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/rt2x00/rt73usb.ko
-  AUTOLOAD:=$(call AutoLoad,27,rt73usb)
+  AUTOLOAD:=$(call AutoProbe,rt73usb)
 endef
 
 define KernelPackage/rt2800-pci
@@ -326,7 +320,7 @@ $(call KernelPackage/rt2x00/Default)
   DEPENDS+= @(PCI_SUPPORT||TARGET_ramips_rt305x) +PCI_SUPPORT:kmod-rt2x00-pci +kmod-rt2800-lib +kmod-lib-crc-ccitt +TARGET_ramips_rt305x:kmod-rt2x00-soc
   TITLE+= (RT2860 PCI)
   FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/rt2x00/rt2800pci.ko
-  AUTOLOAD:=$(call AutoLoad,28,rt2800pci)
+  AUTOLOAD:=$(call AutoProbe,rt2800pci)
 endef
 
 define KernelPackage/rt2800-usb
@@ -334,7 +328,7 @@ $(call KernelPackage/rt2x00/Default)
   DEPENDS+= @USB_SUPPORT +kmod-rt2x00-usb +kmod-rt2800-lib +kmod-lib-crc-ccitt
   TITLE+= (RT2870 USB)
   FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/rt2x00/rt2800usb.ko
-  AUTOLOAD:=$(call AutoLoad,28,rt2800usb)
+  AUTOLOAD:=$(call AutoProbe,rt2800usb)
 endef
 
 define KernelPackage/rtl818x/Default
@@ -349,7 +343,7 @@ define KernelPackage/rtl8180
   DEPENDS+= @PCI_SUPPORT
   TITLE+= (RTL8180 PCI)
   FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/rtl818x/rtl8180/rtl8180.ko
-  AUTOLOAD:=$(call AutoLoad,27,rtl8180)
+  AUTOLOAD:=$(call AutoProbe,rtl8180)
 endef
 
 define KernelPackage/rtl8187
@@ -357,7 +351,7 @@ $(call KernelPackage/rtl818x/Default)
   DEPENDS+= @USB_SUPPORT +kmod-usb-core
   TITLE+= (RTL8187 USB)
   FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/rtl818x/rtl8187/rtl8187.ko
-  AUTOLOAD:=$(call AutoLoad,27,rtl8187)
+  AUTOLOAD:=$(call AutoProbe,rtl8187)
 endef
 
 define KernelPackage/rtlwifi/config
@@ -377,7 +371,6 @@ define KernelPackage/rtlwifi
   TITLE:=Realtek common driver part
   DEPENDS+= @(PCI_SUPPORT||USB_SUPPORT) +kmod-mac80211 +@DRIVER_11N_SUPPORT
   FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/rtlwifi/rtlwifi.ko
-  AUTOLOAD:=$(call AutoLoad,26,rtlwifi)
   MENU:=1
 endef
 
@@ -386,7 +379,7 @@ define KernelPackage/rtlwifi-pci
   TITLE:=Realtek common driver part (PCI support)
   DEPENDS+= @PCI_SUPPORT +kmod-rtlwifi
   FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/rtlwifi/rtl_pci.ko
-  AUTOLOAD:=$(call AutoLoad,27,rtl_pci)
+  AUTOLOAD:=$(call AutoProbe,rtl_pci)
   HIDDEN:=1
 endef
 
@@ -395,7 +388,7 @@ define KernelPackage/rtlwifi-usb
   TITLE:=Realtek common driver part (USB support)
   DEPENDS+= @USB_SUPPORT +kmod-usb-core +kmod-rtlwifi
   FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/rtlwifi/rtl_usb.ko
-  AUTOLOAD:=$(call AutoLoad,27,rtl_usb)
+  AUTOLOAD:=$(call AutoProbe,rtl_usb)
   HIDDEN:=1
 endef
 
@@ -404,7 +397,6 @@ define KernelPackage/rtl8192c-common
   TITLE:=Realtek RTL8192CE/RTL8192CU common support module
   DEPENDS+= +kmod-rtlwifi
   FILES:= $(PKG_BUILD_DIR)/drivers/net/wireless/rtlwifi/rtl8192c/rtl8192c-common.ko
-  AUTOLOAD:=$(call AutoLoad,27,rtl8192c-common)
   HIDDEN:=1
 endef
 
@@ -413,7 +405,7 @@ define KernelPackage/rtl8192ce
   TITLE:=Realtek RTL8192CE/RTL8188CE support
   DEPENDS+= +kmod-rtlwifi-pci +kmod-rtl8192c-common
   FILES:= $(PKG_BUILD_DIR)/drivers/net/wireless/rtlwifi/rtl8192ce/rtl8192ce.ko
-  AUTOLOAD:=$(call AutoLoad,28,rtl8192ce)
+  AUTOLOAD:=$(call AutoProbe,rtl8192ce)
 endef
 
 define KernelPackage/rtl8192ce/install
@@ -426,7 +418,7 @@ define KernelPackage/rtl8192se
   TITLE:=Realtek RTL8192SE/RTL8191SE support
   DEPENDS+= +kmod-rtlwifi-pci
   FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/rtlwifi/rtl8192se/rtl8192se.ko
-  AUTOLOAD:=$(call AutoLoad,28,rtl8192se)
+  AUTOLOAD:=$(call AutoProbe,rtl8192se)
 endef
 
 define KernelPackage/rtl8192se/install
@@ -439,7 +431,7 @@ define KernelPackage/rtl8192de
   TITLE:=Realtek RTL8192DE/RTL8188DE support
   DEPENDS+= +kmod-rtlwifi-pci
   FILES:= $(PKG_BUILD_DIR)/drivers/net/wireless/rtlwifi/rtl8192de/rtl8192de.ko
-  AUTOLOAD:=$(call AutoLoad,28,rtl8192de)
+  AUTOLOAD:=$(call AutoProbe,rtl8192de)
 endef
 
 define KernelPackage/rtl8192de/install
@@ -452,7 +444,7 @@ define KernelPackage/rtl8192cu
   TITLE:=Realtek RTL8192CU/RTL8188CU support
   DEPENDS+= +kmod-rtlwifi-usb +kmod-rtl8192c-common
   FILES:= $(PKG_BUILD_DIR)/drivers/net/wireless/rtlwifi/rtl8192cu/rtl8192cu.ko
-  AUTOLOAD:=$(call AutoLoad,28,rtl8192cu)
+  AUTOLOAD:=$(call AutoProbe,rtl8192cu)
 endef
 
 define KernelPackage/rtl8192cu/install
@@ -474,7 +466,7 @@ define KernelPackage/zd1211rw
   TITLE:=Zydas ZD1211 support
   DEPENDS+= @USB_SUPPORT +kmod-usb-core +kmod-mac80211
   FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/zd1211rw/zd1211rw.ko
-  AUTOLOAD:=$(call AutoLoad,60,zd1211rw)
+  AUTOLOAD:=$(call AutoProbe,zd1211rw)
 endef
 
 define KernelPackage/adm8211
@@ -482,7 +474,7 @@ define KernelPackage/adm8211
   TITLE:=ADMTek 8211 support
   DEPENDS+=@PCI_SUPPORT +kmod-mac80211 +kmod-eeprom-93cx6
   FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/adm8211.ko
-  AUTOLOAD:=$(call AutoLoad,60,adm8211)
+  AUTOLOAD:=$(call AutoProbe,adm8211)
 endef
 
 define KernelPackage/ath/config
@@ -511,7 +503,6 @@ define KernelPackage/ath
   TITLE:=Atheros common driver part
   DEPENDS+= @PCI_SUPPORT||USB_SUPPORT||TARGET_ar71xx||TARGET_atheros +kmod-mac80211
   FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/ath/ath.ko
-  AUTOLOAD:=$(call AutoLoad,26,ath)
   MENU:=1
 endef
 
@@ -525,7 +516,7 @@ define KernelPackage/ath5k
   URL:=http://linuxwireless.org/en/users/Drivers/ath5k
   DEPENDS+= @PCI_SUPPORT||@TARGET_atheros +kmod-ath
   FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/ath/ath5k/ath5k.ko
-  AUTOLOAD:=$(call AutoLoad,27,ath5k)
+  AUTOLOAD:=$(call AutoProbe,ath5k)
 endef
 
 define KernelPackage/ath5k/description
@@ -541,7 +532,6 @@ define KernelPackage/ath9k-common
   FILES:= \
 	$(PKG_BUILD_DIR)/drivers/net/wireless/ath/ath9k/ath9k_common.ko \
 	$(PKG_BUILD_DIR)/drivers/net/wireless/ath/ath9k/ath9k_hw.ko
-  AUTOLOAD:=$(call AutoLoad,27,ath9k_hw ath9k_common)
 endef
 
 define KernelPackage/ath9k
@@ -551,7 +541,7 @@ define KernelPackage/ath9k
   DEPENDS+= @PCI_SUPPORT||TARGET_ar71xx +kmod-ath9k-common
   FILES:= \
 	$(PKG_BUILD_DIR)/drivers/net/wireless/ath/ath9k/ath9k.ko
-  AUTOLOAD:=$(call AutoLoad,28,ath9k)
+  AUTOLOAD:=$(call AutoProbe,ath9k)
 endef
 
 define KernelPackage/ath9k/description
@@ -566,7 +556,7 @@ define KernelPackage/ath9k-htc
   DEPENDS+= @USB_SUPPORT +kmod-ath9k-common +kmod-usb-core
   FILES:= \
 	$(PKG_BUILD_DIR)/drivers/net/wireless/ath/ath9k/ath9k_htc.ko
-  AUTOLOAD:=$(call AutoLoad,55,ath9k_htc)
+  AUTOLOAD:=$(call AutoProbe,ath9k_htc)
 endef
 
 define KernelPackage/ath9k-htc/description
@@ -596,7 +586,7 @@ define KernelPackage/carl9170
   TITLE:=Driver for Atheros AR9170 USB sticks
   DEPENDS:=@USB_SUPPORT +kmod-mac80211 +kmod-ath +kmod-usb-core +kmod-input-core +@DRIVER_11N_SUPPORT
   FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/ath/carl9170/carl9170.ko
-  AUTOLOAD:=$(call AutoLoad,60,carl9170)
+  AUTOLOAD:=$(call AutoProbe,carl9170)
 endef
 
 define KernelPackage/lib80211
@@ -608,7 +598,7 @@ define KernelPackage/lib80211
 	$(PKG_BUILD_DIR)/net/wireless/lib80211_crypt_wep.ko \
 	$(PKG_BUILD_DIR)/net/wireless/lib80211_crypt_ccmp.ko \
 	$(PKG_BUILD_DIR)/net/wireless/lib80211_crypt_tkip.ko
-  AUTOLOAD:=$(call AutoLoad,21, \
+  AUTOLOAD:=$(call AutoProbe, \
 	lib80211 \
 	lib80211_crypt_wep \
 	lib80211_crypt_ccmp \
@@ -632,7 +622,7 @@ define KernelPackage/libertas-usb
   FILES:= \
 	$(PKG_BUILD_DIR)/drivers/net/wireless/libertas/libertas.ko \
 	$(PKG_BUILD_DIR)/drivers/net/wireless/libertas/usb8xxx.ko
-  AUTOLOAD:=$(call AutoLoad,27,libertas usb8xxx)
+  AUTOLOAD:=$(call AutoProbe,libertas usb8xxx)
 endef
 
 define KernelPackage/libertas-sd
@@ -642,7 +632,7 @@ define KernelPackage/libertas-sd
   FILES:= \
 	$(PKG_BUILD_DIR)/drivers/net/wireless/libertas/libertas.ko \
 	$(PKG_BUILD_DIR)/drivers/net/wireless/libertas/libertas_sdio.ko
-  AUTOLOAD:=$(call AutoLoad,91,libertas libertas_sdio)
+  AUTOLOAD:=$(call AutoProbe,libertas libertas_sdio)
 endef
 
 define KernelPackage/mac80211-hwsim
@@ -650,7 +640,7 @@ define KernelPackage/mac80211-hwsim
   TITLE:=mac80211 HW simulation device
   DEPENDS+= +kmod-mac80211
   FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/mac80211_hwsim.ko
-  AUTOLOAD:=$(call AutoLoad,60,mac80211_hwsim)
+  AUTOLOAD:=$(call AutoProbe,mac80211_hwsim)
 endef
 
 define KernelPackage/net-libipw
@@ -658,7 +648,7 @@ define KernelPackage/net-libipw
   TITLE:=libipw for ipw2100 and ipw2200
   DEPENDS:=@PCI_SUPPORT +kmod-crypto-core +kmod-crypto-arc4 +kmod-crypto-aes +kmod-crypto-michael-mic +kmod-lib80211 +kmod-cfg80211 +@DRIVER_WEXT_SUPPORT
   FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/ipw2x00/libipw.ko
-  AUTOLOAD:=$(call AutoLoad,49,libipw)
+  AUTOLOAD:=$(call AutoProbe,libipw)
 endef
 
 define KernelPackage/net-libipw/description
@@ -680,7 +670,7 @@ define KernelPackage/net-ipw2100
   TITLE:=Intel IPW2100 driver
   DEPENDS:=@PCI_SUPPORT +kmod-net-libipw
   FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/ipw2x00/ipw2100.ko
-  AUTOLOAD:=$(call AutoLoad,50,ipw2100)
+  AUTOLOAD:=$(call AutoProbe,ipw2100)
 endef
 
 define KernelPackage/net-ipw2100/description
@@ -704,7 +694,7 @@ define KernelPackage/net-ipw2200
   TITLE:=Intel IPW2200 driver
   DEPENDS:=@PCI_SUPPORT +kmod-net-libipw
   FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/ipw2x00/ipw2200.ko
-  AUTOLOAD:=$(call AutoLoad,50,ipw2200)
+  AUTOLOAD:=$(call AutoProbe,ipw2200)
 endef
 
 define KernelPackage/net-ipw2200/description
@@ -719,7 +709,7 @@ define KernelPackage/net-hermes
   TITLE:=Hermes 802.11b chipset support
   DEPENDS:=@PCI_SUPPORT||PCMCIA_SUPPORT +kmod-cfg80211 +@DRIVER_WEXT_SUPPORT
   FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/orinoco/orinoco.ko
-  AUTOLOAD:=$(call AutoLoad,50,orinoco)
+  AUTOLOAD:=$(call AutoProbe,orinoco)
 endef
 
 define KernelPackage/net-hermes/description
@@ -731,7 +721,7 @@ define KernelPackage/net-hermes-pci
   TITLE:=Intersil Prism 2.5 PCI support
   DEPENDS:=@PCI_SUPPORT +kmod-net-hermes
   FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/orinoco/orinoco_pci.ko
-  AUTOLOAD:=$(call AutoLoad,55,orinoco_pci)
+  AUTOLOAD:=$(call AutoProbe,orinoco_pci)
 endef
 
 define KernelPackage/net-hermes-pci/description
@@ -743,7 +733,7 @@ define KernelPackage/net-hermes-plx
   TITLE:=PLX9052 based PCI adaptor
   DEPENDS:=@PCI_SUPPORT +kmod-net-hermes
   FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/orinoco/orinoco_plx.ko
-  AUTOLOAD:=$(call AutoLoad,55,orinoco_plx)
+  AUTOLOAD:=$(call AutoProbe,orinoco_plx)
 endef
 
 define KernelPackage/net-hermes-plx/description
@@ -755,7 +745,7 @@ define KernelPackage/net-hermes-pcmcia
   TITLE:=Hermes based PCMCIA adaptors
   DEPENDS:=@PCMCIA_SUPPORT +kmod-net-hermes @BROKEN
   FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/orinoco/orinoco_cs.ko
-  AUTOLOAD:=$(call AutoLoad,55,orinoco_cs)
+  AUTOLOAD:=$(call AutoProbe,orinoco_cs)
 endef
 
 define KernelPackage/net-hermes-pcmcia/description
@@ -767,7 +757,7 @@ define KernelPackage/iwlagn
   DEPENDS:= +kmod-mac80211 @PCI_SUPPORT +@DRIVER_11N_SUPPORT
   TITLE:=Intel AGN Wireless support
   FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/iwlwifi/iwlwifi.ko
-  AUTOLOAD:=$(call AutoLoad,60,iwlwifi)
+  AUTOLOAD:=$(call AutoProbe,iwlwifi)
   MENU:=1
 endef
 
@@ -869,7 +859,7 @@ define KernelPackage/iwl-legacy
   DEPENDS:= +kmod-mac80211 @PCI_SUPPORT
   TITLE:=Intel legacy Wireless support
   FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/iwlegacy/iwlegacy.ko
-  AUTOLOAD:=$(call AutoLoad,60,iwlegacy)
+  AUTOLOAD:=$(call AutoProbe,iwlegacy)
 endef
 
 define KernelPackage/iwl-legacy/description
@@ -881,7 +871,7 @@ define KernelPackage/iwl3945
   DEPENDS:= +kmod-mac80211 +kmod-iwl-legacy
   TITLE:=Intel iwl3945 Wireless support
   FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/iwlegacy/iwl3945.ko
-  AUTOLOAD:=$(call AutoLoad,61,iwl3945)
+  AUTOLOAD:=$(call AutoProbe,iwl3945)
 endef
 
 define KernelPackage/iwl3945/description
@@ -893,7 +883,7 @@ define KernelPackage/iwl4965
   DEPENDS:= +kmod-mac80211 +kmod-iwl-legacy +@DRIVER_11N_SUPPORT
   TITLE:=Intel iwl4965 Wireless support
   FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/iwlegacy/iwl4965.ko
-  AUTOLOAD:=$(call AutoLoad,61,iwl4965)
+  AUTOLOAD:=$(call AutoProbe,iwl4965)
 endef
 
 define KernelPackage/iwl4965/description
@@ -907,7 +897,7 @@ define KernelPackage/mwl8k
   URL:=http://wireless.kernel.org/en/users/Drivers/mwl8k
   DEPENDS+= @PCI_SUPPORT +kmod-mac80211 +@DRIVER_11N_SUPPORT
   FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/mwl8k.ko
-  AUTOLOAD:=$(call AutoLoad,27,mwl8k)
+  AUTOLOAD:=$(call AutoProbe,mwl8k)
 endef
 
 define KernelPackage/mwl8k/description
@@ -924,7 +914,7 @@ define KernelPackage/wl12xx
 	$(PKG_BUILD_DIR)/drivers/net/wireless/ti/wl12xx/wl12xx.ko \
 	$(PKG_BUILD_DIR)/drivers/net/wireless/ti/wlcore/wlcore.ko \
 	$(PKG_BUILD_DIR)/drivers/net/wireless/ti/wlcore/wlcore_sdio.ko
-  AUTOLOAD:=$(call AutoLoad,61,wlcore wlcore_sdio wl12xx)
+  AUTOLOAD:=$(call AutoProbe,wlcore wlcore_sdio wl12xx)
 endef
 
 define KernelPackage/wl12xx/description
@@ -1004,7 +994,7 @@ define KernelPackage/b43
   	CONFIG_HW_RANDOM=y
   DEPENDS+= +kmod-mac80211 +!TARGET_brcm47xx:kmod-bcma +!(TARGET_brcm47xx||TARGET_brcm63xx):kmod-ssb
   FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/b43/b43.ko
-  AUTOLOAD:=$(call AutoLoad,30,b43)
+  AUTOLOAD:=$(call AutoProbe,b43)
   MENU:=1
 endef
 
@@ -1175,7 +1165,7 @@ define KernelPackage/b43legacy
   	CONFIG_HW_RANDOM=y
   DEPENDS+= +kmod-mac80211 +!(TARGET_brcm47xx||TARGET_brcm63xx):kmod-ssb
   FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/b43legacy/b43legacy.ko
-  AUTOLOAD:=$(call AutoLoad,30,b43legacy)
+  AUTOLOAD:=$(call AutoProbe,b43legacy)
   MENU:=1
 endef
 
@@ -1219,7 +1209,7 @@ define KernelPackage/brcmutil
   URL:=http://linuxwireless.org/en/users/Drivers/brcm80211
   DEPENDS+=@PCI_SUPPORT||USB_SUPPORT
   FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/brcm80211/brcmutil/brcmutil.ko
-  AUTOLOAD:=$(call AutoLoad,30,brcmutil)
+  AUTOLOAD:=$(call AutoProbe,brcmutil)
   MENU:=1
 endef
 
@@ -1258,7 +1248,7 @@ define KernelPackage/brcmsmac
   URL:=http://linuxwireless.org/en/users/Drivers/brcm80211
   DEPENDS+= +kmod-mac80211 +@DRIVER_11N_SUPPORT +!TARGET_brcm47xx:kmod-bcma +kmod-lib-cordic +kmod-lib-crc8 +kmod-brcmutil
   FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/brcm80211/brcmsmac/brcmsmac.ko
-  AUTOLOAD:=$(call AutoLoad,31,brcmsmac)
+  AUTOLOAD:=$(call AutoProbe,brcmsmac)
   MENU:=1
 endef
 
@@ -1290,7 +1280,7 @@ define KernelPackage/brcmfmac
   URL:=http://linuxwireless.org/en/users/Drivers/brcm80211
   DEPENDS+= @USB_SUPPORT +kmod-usb-core +kmod-cfg80211 +@DRIVER_11N_SUPPORT +kmod-brcmutil
   FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/brcm80211/brcmfmac/brcmfmac.ko
-  AUTOLOAD:=$(call AutoLoad,60,brcmfmac)
+  AUTOLOAD:=$(call AutoProbe,brcmfmac)
 endef
 
 define KernelPackage/brcmfmac/description