ExternalVendorCode/openwrt
1
0
Fork 0
mirror of https://github.com/openwrt/openwrt.git synced 2024-12-20 06:08:08 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

kernel: remove even more calls to CompareKernelPatchVer

Browse Source 
SVN-Revision: 19057
This commit is contained in:
Nicolas Thill 2010-01-06 18:46:42 +00:00
parent 23f08317be
commit 04ba8ab358
3 changed files with 6 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
package/kernel/modules/other.mk
View File

@ -71,11 +71,7 @@ define KernelPackage/eeprom-93cx6
TITLE:=EEPROM 93CX6 support TITLE:=EEPROM 93CX6 support
DEPENDS:=@LINUX_2_6 DEPENDS:=@LINUX_2_6
KCONFIG:=CONFIG_EEPROM_93CX6 KCONFIG:=CONFIG_EEPROM_93CX6
ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,2.6.29)),1)
FILES:=$(LINUX_DIR)/drivers/misc/eeprom/eeprom_93cx6.$(LINUX_KMOD_SUFFIX) FILES:=$(LINUX_DIR)/drivers/misc/eeprom/eeprom_93cx6.$(LINUX_KMOD_SUFFIX)
else
FILES:=$(LINUX_DIR)/drivers/misc/eeprom_93cx6.$(LINUX_KMOD_SUFFIX)
endif
AUTOLOAD:=$(call AutoLoad,20,eeprom_93cx6) AUTOLOAD:=$(call AutoLoad,20,eeprom_93cx6)
endef endef

16
package/kernel/modules/video.mk
View File

@ -26,7 +26,6 @@ define KernelPackage/video-core/2.4
AUTOLOAD:=$(call AutoLoad,60,videodev) AUTOLOAD:=$(call AutoLoad,60,videodev)
endef endef
ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,2.6.29)),1)
define KernelPackage/video-core/2.6 define KernelPackage/video-core/2.6
FILES:= \ FILES:= \
$(LINUX_DIR)/drivers/media/video/v4l2-common.$(LINUX_KMOD_SUFFIX) \ $(LINUX_DIR)/drivers/media/video/v4l2-common.$(LINUX_KMOD_SUFFIX) \
@ -38,21 +37,6 @@ define KernelPackage/video-core/2.6
v4l2-common \ v4l2-common \
) )
endef endef
else
define KernelPackage/video-core/2.6
FILES:= \
$(LINUX_DIR)/drivers/media/video/v4l2-common.$(LINUX_KMOD_SUFFIX) \
$(LINUX_DIR)/drivers/media/video/v4l1-compat.$(LINUX_KMOD_SUFFIX) \
$(LINUX_DIR)/drivers/media/video/compat_ioctl32.$(LINUX_KMOD_SUFFIX) \
$(LINUX_DIR)/drivers/media/video/videodev.$(LINUX_KMOD_SUFFIX)
AUTOLOAD:=$(call AutoLoad,60, \
v4l1-compat \
videodev \
v4l2-common \
compat_ioctl32 \
)
endef
endif
define KernelPackage/video-core/description define KernelPackage/video-core/description
Kernel modules for Video4Linux support Kernel modules for Video4Linux support

27
package/kernel/modules/wireless.mk
View File

@ -80,16 +80,12 @@ endef
$(eval $(call KernelPackage,lib80211)) $(eval $(call KernelPackage,lib80211))
ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,2.6.29)),1)
IPW_DIR:=ipw2x00/
endif
define KernelPackage/net-libipw define KernelPackage/net-libipw
SUBMENU:=$(WIRELESS_MENU) SUBMENU:=$(WIRELESS_MENU)
TITLE:=libipw for ipw2100 and ipw2200 TITLE:=libipw for ipw2100 and ipw2200
DEPENDS:=@PCI_SUPPORT +kmod-crypto-arc4 +kmod-crypto-aes +kmod-crypto-michael-mic +kmod-lib80211 @LINUX_2_6_30||LINUX_2_6_31||LINUX_2_6_32 DEPENDS:=@PCI_SUPPORT +kmod-crypto-arc4 +kmod-crypto-aes +kmod-crypto-michael-mic +kmod-lib80211 @LINUX_2_6_30||LINUX_2_6_31||LINUX_2_6_32
KCONFIG:=CONFIG_LIBIPW KCONFIG:=CONFIG_LIBIPW
FILES:=$(LINUX_DIR)/drivers/net/wireless/$(IPW_DIR)libipw.$(LINUX_KMOD_SUFFIX) FILES:=$(LINUX_DIR)/drivers/net/wireless/ipw2x00/libipw.$(LINUX_KMOD_SUFFIX)
AUTOLOAD:=$(call AutoLoad,49,libipw) AUTOLOAD:=$(call AutoLoad,49,libipw)
endef endef
@ -105,7 +101,7 @@ define KernelPackage/net-ipw2100
TITLE:=Intel IPW2100 driver TITLE:=Intel IPW2100 driver
DEPENDS:=@PCI_SUPPORT +!(LINUX_2_6_30||LINUX_2_6_31):kmod-ieee80211 +LINUX_2_6_30||LINUX_2_6_31:kmod-net-libipw DEPENDS:=@PCI_SUPPORT +!(LINUX_2_6_30||LINUX_2_6_31):kmod-ieee80211 +LINUX_2_6_30||LINUX_2_6_31:kmod-net-libipw
KCONFIG:=CONFIG_IPW2100 KCONFIG:=CONFIG_IPW2100
FILES:=$(LINUX_DIR)/drivers/net/wireless/$(IPW_DIR)ipw2100.$(LINUX_KMOD_SUFFIX) FILES:=$(LINUX_DIR)/drivers/net/wireless/ipw2x00/ipw2100.$(LINUX_KMOD_SUFFIX)
AUTOLOAD:=$(call AutoLoad,50,ipw2100) AUTOLOAD:=$(call AutoLoad,50,ipw2100)
endef endef
@ -123,7 +119,7 @@ define KernelPackage/net-ipw2200
TITLE:=Intel IPW2200 driver TITLE:=Intel IPW2200 driver
DEPENDS:=@PCI_SUPPORT +!(LINUX_2_6_30||LINUX_2_6_31):kmod-ieee80211 +LINUX_2_6_30||LINUX_2_6_31:kmod-net-libipw DEPENDS:=@PCI_SUPPORT +!(LINUX_2_6_30||LINUX_2_6_31):kmod-ieee80211 +LINUX_2_6_30||LINUX_2_6_31:kmod-net-libipw
KCONFIG:=CONFIG_IPW2200 KCONFIG:=CONFIG_IPW2200
FILES:=$(LINUX_DIR)/drivers/net/wireless/$(IPW_DIR)ipw2200.$(LINUX_KMOD_SUFFIX) FILES:=$(LINUX_DIR)/drivers/net/wireless/ipw2x00/ipw2200.$(LINUX_KMOD_SUFFIX)
AUTOLOAD:=$(call AutoLoad,50,ipw2200) AUTOLOAD:=$(call AutoLoad,50,ipw2200)
endef endef
@ -152,26 +148,15 @@ endef
$(eval $(call KernelPackage,net-airo)) $(eval $(call KernelPackage,net-airo))
ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,2.6.29)),1)
ORINOCO_DIR:=orinoco/
endif
define KernelPackage/net-hermes define KernelPackage/net-hermes
SUBMENU:=$(WIRELESS_MENU) SUBMENU:=$(WIRELESS_MENU)
TITLE:=Hermes 802.11b chipset support TITLE:=Hermes 802.11b chipset support
DEPENDS:=@LINUX_2_6 @PCI_SUPPORT||PCMCIA_SUPPORT DEPENDS:=@LINUX_2_6 @PCI_SUPPORT||PCMCIA_SUPPORT
KCONFIG:=CONFIG_HERMES \ KCONFIG:=CONFIG_HERMES \
CONFIG_HERMES_CACHE_FW_ON_INIT=n CONFIG_HERMES_CACHE_FW_ON_INIT=n
ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,2.6.30)),1)
FILES:= \ FILES:= \
$(LINUX_DIR)/drivers/net/wireless/$(ORINOCO_DIR)orinoco.$(LINUX_KMOD_SUFFIX) $(LINUX_DIR)/drivers/net/wireless/orinoco/orinoco.$(LINUX_KMOD_SUFFIX)
AUTOLOAD:=$(call AutoLoad,50,orinoco) AUTOLOAD:=$(call AutoLoad,50,orinoco)
else
FILES:= \
$(LINUX_DIR)/drivers/net/wireless/hermes.$(LINUX_KMOD_SUFFIX) \
$(LINUX_DIR)/drivers/net/wireless/orinoco.$(LINUX_KMOD_SUFFIX)
AUTOLOAD:=$(call AutoLoad,50,hermes orinoco)
endif
endef endef
define KernelPackage/net-hermes/description define KernelPackage/net-hermes/description
@ -186,7 +171,7 @@ define KernelPackage/net-hermes-pci
TITLE:=Intersil Prism 2.5 PCI support TITLE:=Intersil Prism 2.5 PCI support
DEPENDS:=@PCI_SUPPORT +kmod-net-hermes DEPENDS:=@PCI_SUPPORT +kmod-net-hermes
KCONFIG:=CONFIG_PCI_HERMES KCONFIG:=CONFIG_PCI_HERMES
FILES:=$(LINUX_DIR)/drivers/net/wireless/$(ORINOCO_DIR)orinoco_pci.$(LINUX_KMOD_SUFFIX) FILES:=$(LINUX_DIR)/drivers/net/wireless/orinoco/orinoco_pci.$(LINUX_KMOD_SUFFIX)
AUTOLOAD:=$(call AutoLoad,55,orinoco_pci) AUTOLOAD:=$(call AutoLoad,55,orinoco_pci)
endef endef
@ -202,7 +187,7 @@ define KernelPackage/net-hermes-plx
TITLE:=PLX9052 based PCI adaptor TITLE:=PLX9052 based PCI adaptor
DEPENDS:=@PCI_SUPPORT +kmod-net-hermes DEPENDS:=@PCI_SUPPORT +kmod-net-hermes
KCONFIG:=CONFIG_PLX_HERMES KCONFIG:=CONFIG_PLX_HERMES
FILES:=$(LINUX_DIR)/drivers/net/wireless/$(ORINOCO_DIR)orinoco_plx.$(LINUX_KMOD_SUFFIX) FILES:=$(LINUX_DIR)/drivers/net/wireless/orinoco/orinoco_plx.$(LINUX_KMOD_SUFFIX)
AUTOLOAD:=$(call AutoLoad,55,orinoco_plx) AUTOLOAD:=$(call AutoLoad,55,orinoco_plx)
endef endef