diff options
author | Felix Fietkau <nbd@openwrt.org> | 2012-05-27 15:22:13 +0000 |
---|---|---|
committer | Felix Fietkau <nbd@openwrt.org> | 2012-05-27 15:22:13 +0000 |
commit | aba80d0d041f8c225c4ddbe214c189e779b2f45e (patch) | |
tree | bf5909ee686ad55e86c0c9b143c2db8e6e51b343 /package/kernel/modules | |
parent | 260e2d84866dfbbd30079da950e0a947e91fe905 (diff) | |
download | master-187ad058-aba80d0d041f8c225c4ddbe214c189e779b2f45e.tar.gz master-187ad058-aba80d0d041f8c225c4ddbe214c189e779b2f45e.tar.bz2 master-187ad058-aba80d0d041f8c225c4ddbe214c189e779b2f45e.zip |
kernel: remove more unnecessary kernel version checks/dependencies
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31907 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/kernel/modules')
-rw-r--r-- | package/kernel/modules/crypto.mk | 14 | ||||
-rw-r--r-- | package/kernel/modules/netdevices.mk | 24 | ||||
-rw-r--r-- | package/kernel/modules/netsupport.mk | 42 | ||||
-rw-r--r-- | package/kernel/modules/other.mk | 4 | ||||
-rw-r--r-- | package/kernel/modules/pcmcia.mk | 4 | ||||
-rw-r--r-- | package/kernel/modules/usb.mk | 9 | ||||
-rw-r--r-- | package/kernel/modules/video.mk | 2 |
7 files changed, 16 insertions, 83 deletions
diff --git a/package/kernel/modules/crypto.mk b/package/kernel/modules/crypto.mk index a148af1227..eb256be740 100644 --- a/package/kernel/modules/crypto.mk +++ b/package/kernel/modules/crypto.mk @@ -376,18 +376,10 @@ define KernelPackage/crypto-misc $(LINUX_DIR)/crypto/twofish_common.ko \ $(LINUX_DIR)/crypto/wp512.ko \ $(LINUX_DIR)/crypto/twofish_generic.ko - ifdef CONFIG_LINUX_3_1 - FILES += $(LINUX_DIR)/crypto/blowfish.ko - else - FILES += \ + FILES += \ $(LINUX_DIR)/crypto/blowfish_common.ko \ - $(LINUX_DIR)/crypto/blowfish_generic.ko - endif - ifeq ($(CONFIG_LINUX_3_1)$(CONFIG_LINUX_3_2)),) - FILES += $(LINUX_DIR)/crypto/serpent.ko - else - FILES += $(LINUX_DIR)/crypto/serpent_generic.ko - endif + $(LINUX_DIR)/crypto/blowfish_generic.ko \ + $(LINUX_DIR)/crypto/serpent_generic.ko $(call AddDepends/crypto) endef diff --git a/package/kernel/modules/netdevices.mk b/package/kernel/modules/netdevices.mk index d8cd57c81e..6aac4d37c8 100644 --- a/package/kernel/modules/netdevices.mk +++ b/package/kernel/modules/netdevices.mk @@ -344,11 +344,7 @@ define KernelPackage/r8169 KCONFIG:=CONFIG_R8169 \ CONFIG_R8169_NAPI=y \ CONFIG_R8169_VLAN=n - ifndef CONFIG_LINUX_3_1 - FILES:=$(LINUX_DIR)/drivers/net/ethernet/realtek/r8169.ko - else - FILES:=$(LINUX_DIR)/drivers/net/r8169.ko - endif + FILES:=$(LINUX_DIR)/drivers/net/ethernet/realtek/r8169.ko AUTOLOAD:=$(call AutoLoad,50,r8169) endef @@ -407,11 +403,7 @@ define KernelPackage/e1000 KCONFIG:=CONFIG_E1000 \ CONFIG_E1000_DISABLE_PACKET_SPLIT=n \ CONFIG_E1000_NAPI=y - ifndef CONFIG_LINUX_3_1 - FILES:=$(LINUX_DIR)/drivers/net/ethernet/intel/e1000/e1000.ko - else - FILES:=$(LINUX_DIR)/drivers/net/e1000/e1000.ko - endif + FILES:=$(LINUX_DIR)/drivers/net/ethernet/intel/e1000/e1000.ko AUTOLOAD:=$(call AutoLoad,35,e1000) endef @@ -427,11 +419,7 @@ define KernelPackage/e1000e TITLE:=Intel(R) PRO/1000 PCIe cards kernel support DEPENDS:=@PCIE_SUPPORT KCONFIG:=CONFIG_E1000E - ifndef CONFIG_LINUX_3_1 - FILES:=$(LINUX_DIR)/drivers/net/ethernet/intel/e1000e/e1000e.ko - else - FILES:=$(LINUX_DIR)/drivers/net/e1000e/e1000e.ko - endif + FILES:=$(LINUX_DIR)/drivers/net/ethernet/intel/e1000e/e1000e.ko AUTOLOAD:=$(call AutoLoad,50,e1000e) endef @@ -501,11 +489,7 @@ define KernelPackage/tg3 KCONFIG:=CONFIG_TIGON3 DEPENDS:=+!TARGET_brcm47xx:kmod-libphy @!TARGET_ubicom32 SUBMENU:=$(NETWORK_DEVICES_MENU) - ifndef CONFIG_LINUX_3_1 - FILES:=$(LINUX_DIR)/drivers/net/ethernet/broadcom/tg3.ko - else - FILES:=$(LINUX_DIR)/drivers/net/tg3.ko - endif + FILES:=$(LINUX_DIR)/drivers/net/ethernet/broadcom/tg3.ko AUTOLOAD:=$(call AutoLoad,50,tg3) endef diff --git a/package/kernel/modules/netsupport.mk b/package/kernel/modules/netsupport.mk index 656be4a0f1..0b4b16efbb 100644 --- a/package/kernel/modules/netsupport.mk +++ b/package/kernel/modules/netsupport.mk @@ -467,17 +467,10 @@ define KernelPackage/ppp CONFIG_PPP \ CONFIG_PPP_ASYNC \ CONFIG_SLHC - ifndef CONFIG_LINUX_3_1 - FILES:= \ + FILES:= \ $(LINUX_DIR)/drivers/net/ppp/ppp_async.ko \ $(LINUX_DIR)/drivers/net/ppp/ppp_generic.ko \ $(LINUX_DIR)/drivers/net/slip/slhc.ko - else - FILES:= \ - $(LINUX_DIR)/drivers/net/ppp_async.ko \ - $(LINUX_DIR)/drivers/net/ppp_generic.ko \ - $(LINUX_DIR)/drivers/net/slhc.ko - endif AUTOLOAD:=$(call AutoLoad,30,slhc ppp_generic ppp_async) endef @@ -493,11 +486,7 @@ define KernelPackage/ppp-synctty TITLE:=PPP sync tty support DEPENDS:=kmod-ppp KCONFIG:=CONFIG_PPP_SYNC_TTY - ifndef CONFIG_LINUX_3_1 - FILES:=$(LINUX_DIR)/drivers/net/ppp/ppp_synctty.ko - else - FILES:=$(LINUX_DIR)/drivers/net/ppp_synctty.ko - endif + FILES:=$(LINUX_DIR)/drivers/net/ppp/ppp_synctty.ko AUTOLOAD:=$(call AutoLoad,40,ppp_synctty) endef @@ -513,15 +502,9 @@ define KernelPackage/pppoe TITLE:=PPPoE support DEPENDS:=kmod-ppp KCONFIG:=CONFIG_PPPOE - ifndef CONFIG_LINUX_3_1 - FILES:= \ + FILES:= \ $(LINUX_DIR)/drivers/net/ppp/pppoe.ko \ $(LINUX_DIR)/drivers/net/ppp/pppox.ko - else - FILES:= \ - $(LINUX_DIR)/drivers/net/pppoe.ko \ - $(LINUX_DIR)/drivers/net/pppox.ko - endif AUTOLOAD:=$(call AutoLoad,40,pppox pppoe) endef @@ -553,11 +536,7 @@ define KernelPackage/pptp TITLE:=PPtP support DEPENDS:=kmod-ppp +kmod-gre KCONFIG:=CONFIG_PPTP - ifndef CONFIG_LINUX_3_1 - FILES:=$(LINUX_DIR)/drivers/net/ppp/pptp.ko - else - FILES:=$(LINUX_DIR)/drivers/net/pptp.ko - endif + FILES:=$(LINUX_DIR)/drivers/net/ppp/pptp.ko AUTOLOAD:=$(call AutoLoad,41,pptp) endef @@ -603,11 +582,7 @@ define KernelPackage/mppe KCONFIG:= \ CONFIG_PPP_MPPE_MPPC \ CONFIG_PPP_MPPE - ifndef CONFIG_LINUX_3_1 - FILES:=$(LINUX_DIR)/drivers/net/ppp/ppp_mppe.ko - else - FILES:=$(LINUX_DIR)/drivers/net/ppp_mppe.ko - endif + FILES:=$(LINUX_DIR)/drivers/net/ppp/ppp_mppe.ko AUTOLOAD:=$(call AutoLoad,31,ppp_mppe) endef @@ -853,13 +828,8 @@ define KernelPackage/slip CONFIG_SLIP_SMART=y \ CONFIG_SLIP_MODE_SLIP6=y - ifndef CONFIG_LINUX_3_1 - FILES:= \ + FILES:= \ $(LINUX_DIR)/drivers/net/slip/slip.ko - else - FILES:= \ - $(LINUX_DIR)/drivers/net/slip.ko - endif AUTOLOAD:=$(call AutoLoad,30,slip) endef diff --git a/package/kernel/modules/other.mk b/package/kernel/modules/other.mk index 64246eebf3..1bf1755d32 100644 --- a/package/kernel/modules/other.mk +++ b/package/kernel/modules/other.mk @@ -863,11 +863,7 @@ define KernelPackage/serial-8250 CONFIG_SERIAL_8250_SHARE_IRQ=y \ CONFIG_SERIAL_8250_DETECT_IRQ=n \ CONFIG_SERIAL_8250_RSA=n -ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,3.3)),1) FILES:=$(LINUX_DIR)/drivers/tty/serial/8250/8250.ko -else - FILES:=$(LINUX_DIR)/drivers/tty/serial/8250.ko -endif endef define KernelPackage/serial-8250/description diff --git a/package/kernel/modules/pcmcia.mk b/package/kernel/modules/pcmcia.mk index a803a03dd8..cac727719c 100644 --- a/package/kernel/modules/pcmcia.mk +++ b/package/kernel/modules/pcmcia.mk @@ -69,11 +69,7 @@ define KernelPackage/pcmcia-serial KCONFIG:= \ CONFIG_PCMCIA_SERIAL_CS \ CONFIG_SERIAL_8250_CS - ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,3.3)),1) FILES:=$(LINUX_DIR)/drivers/tty/serial/8250/serial_cs.ko - else - FILES:=$(LINUX_DIR)/drivers/tty/serial/serial_cs.ko - endif AUTOLOAD:=$(call AutoLoad,45,serial_cs) endef diff --git a/package/kernel/modules/usb.mk b/package/kernel/modules/usb.mk index 537149c36d..143f7540f7 100644 --- a/package/kernel/modules/usb.mk +++ b/package/kernel/modules/usb.mk @@ -16,15 +16,10 @@ define KernelPackage/usb-core TITLE:=Support for USB DEPENDS:=@USB_SUPPORT KCONFIG:=CONFIG_USB CONFIG_XPS_USB_HCD_XILINX=n CONFIG_USB_FHCI_HCD=n - ifndef CONFIG_LINUX_3_1 - FILES:= \ + FILES:= \ $(LINUX_DIR)/drivers/usb/core/usbcore.ko \ $(LINUX_DIR)/drivers/usb/usb-common.ko - AUTOLOAD:=$(call AutoLoad,20,usb-common usbcore,1) - else - FILES:=$(LINUX_DIR)/drivers/usb/core/usbcore.ko - AUTOLOAD:=$(call AutoLoad,20,usbcore,1) - endif + AUTOLOAD:=$(call AutoLoad,20,usb-common usbcore,1) $(call AddDepends/nls) endef diff --git a/package/kernel/modules/video.mk b/package/kernel/modules/video.mk index d5063e8250..4e0e7f30a6 100644 --- a/package/kernel/modules/video.mk +++ b/package/kernel/modules/video.mk @@ -116,7 +116,7 @@ $(eval $(call KernelPackage,video-pwc)) define KernelPackage/video-uvc TITLE:=USB Video Class (UVC) support - DEPENDS:=@USB_SUPPORT +kmod-usb-core +!(LINUX_2_6_39||LINUX_3_1||LINUX_3_2):kmod-video-videobuf2 + DEPENDS:=@USB_SUPPORT +kmod-usb-core +kmod-video-videobuf2 KCONFIG:= CONFIG_USB_VIDEO_CLASS FILES:=$(LINUX_DIR)/drivers/media/video/uvc/uvcvideo.ko AUTOLOAD:=$(call AutoLoad,90,uvcvideo) |