[brcm63xx] cleanup the watchdog driver a bit

[openwrt.git] / package / kernel / modules / wireless.mk

diff --git a/package/kernel/modules/wireless.mk b/package/kernel/modules/wireless.mk
index 523157ae9075742d876e61e83128a16eafedf8a6..cca2d9e83eab63ac99d77fb880c9948cbc45ac30 100644 (file)
--- a/package/kernel/modules/wireless.mk
+++ b/package/kernel/modules/wireless.mk
@@ -80,40 +80,6 @@ endef
 $(eval $(call KernelPackage,lib80211))
 
 
-define KernelPackage/ieee80211-softmac
-  SUBMENU:=$(WIRELESS_MENU)
-  TITLE:=ieee80211 SoftMAC support
-  DEPENDS:=+kmod-ieee80211 @LINUX_2_6_21||@LINUX_2_6_23||@LINUX_2_6_24||@LINUX_2_6_25
-  KCONFIG:=CONFIG_IEEE80211_SOFTMAC
-  FILES:=$(LINUX_DIR)/net/ieee80211/softmac/ieee80211softmac.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,20,ieee80211softmac)
-endef
-
-define KernelPackage/ieee80211-softmac/description
- Kernel modules for 802.11 SoftMAC support
-endef
-
-$(eval $(call KernelPackage,ieee80211-softmac))
-
-
-define KernelPackage/net-bcm43xx
-  SUBMENU:=$(WIRELESS_MENU)
-  TITLE:=Broadcom BCM43xx driver
-  DEPENDS:=@TARGET_brcm47xx||TARGET_brcm63xx +kmod-ieee80211-softmac
-  KCONFIG:=CONFIG_BCM43XX
-  FILES:=$(LINUX_DIR)/drivers/net/wireless/bcm43xx/bcm43xx.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,50,bcm43xx)
-endef
-
-define KernelPackage/net-bcm43xx/description
- Kernel support for Broadcom BCM43xx
- Includes:
- - bcm43xx
-endef
-
-$(eval $(call KernelPackage,net-bcm43xx))
-
-
 ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,2.6.29)),1)
   IPW_DIR:=ipw2x00/
 endif
@@ -196,6 +162,11 @@ define KernelPackage/net-hermes
   DEPENDS:=@LINUX_2_6 @PCI_SUPPORT||PCMCIA_SUPPORT
   KCONFIG:=CONFIG_HERMES \
        CONFIG_HERMES_CACHE_FW_ON_INIT=n
+ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,2.6.30)),1)
+  FILES:= \
+       $(LINUX_DIR)/drivers/net/wireless/$(ORINOCO_DIR)orinoco.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,50,orinoco)
+else
 ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,2.6.28)),1)
   FILES:= \
        $(LINUX_DIR)/drivers/net/wireless/$(ORINOCO_DIR)hermes.$(LINUX_KMOD_SUFFIX) \
@@ -208,6 +179,7 @@ else
        $(LINUX_DIR)/drivers/net/wireless/orinoco.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,50,hermes orinoco)
 endif
+endif
 endef
 
 define KernelPackage/net-hermes/description