projects
/
openwrt
/
openwrt.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
51bc47c
)
kernel: remove more unnecessary kernel version checks/dependencies
author
Felix Fietkau
<nbd@openwrt.org>
Sun, 27 May 2012 15:22:13 +0000
(15:22 +0000)
committer
Felix Fietkau
<nbd@openwrt.org>
Sun, 27 May 2012 15:22:13 +0000
(15:22 +0000)
SVN-Revision: 31907
package/kernel/modules/crypto.mk
patch
|
blob
|
history
package/kernel/modules/netdevices.mk
patch
|
blob
|
history
package/kernel/modules/netsupport.mk
patch
|
blob
|
history
package/kernel/modules/other.mk
patch
|
blob
|
history
package/kernel/modules/pcmcia.mk
patch
|
blob
|
history
package/kernel/modules/usb.mk
patch
|
blob
|
history
package/kernel/modules/video.mk
patch
|
blob
|
history
diff --git
a/package/kernel/modules/crypto.mk
b/package/kernel/modules/crypto.mk
index a148af122761a5d342d4923508a279648891ff29..eb256be7408fb34d424f6efbf489e2fd3696dc06 100644
(file)
--- 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
$(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_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
$(call AddDepends/crypto)
endef
diff --git
a/package/kernel/modules/netdevices.mk
b/package/kernel/modules/netdevices.mk
index d8cd57c81ed676bf391d04212d282440f82a4700..6aac4d37c8106cc778d0dcdaf8a53776486999c4 100644
(file)
--- 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
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
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
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
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
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
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)
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
AUTOLOAD:=$(call AutoLoad,50,tg3)
endef
diff --git
a/package/kernel/modules/netsupport.mk
b/package/kernel/modules/netsupport.mk
index 656be4a0f10ee30ea1cd937a35f7e66894d613ea..0b4b16efbb976172c77894eca99aa9a81fef21ca 100644
(file)
--- 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
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
$(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
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
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
AUTOLOAD:=$(call AutoLoad,40,ppp_synctty)
endef
@@
-513,15
+502,9
@@
define KernelPackage/pppoe
TITLE:=PPPoE support
DEPENDS:=kmod-ppp
KCONFIG:=CONFIG_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
$(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
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
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
AUTOLOAD:=$(call AutoLoad,41,pptp)
endef
@@
-603,11
+582,7
@@
define KernelPackage/mppe
KCONFIG:= \
CONFIG_PPP_MPPE_MPPC \
CONFIG_PPP_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
AUTOLOAD:=$(call AutoLoad,31,ppp_mppe)
endef
@@
-853,13
+828,8
@@
define KernelPackage/slip
CONFIG_SLIP_SMART=y \
CONFIG_SLIP_MODE_SLIP6=y
CONFIG_SLIP_SMART=y \
CONFIG_SLIP_MODE_SLIP6=y
- ifndef CONFIG_LINUX_3_1
- FILES:= \
+ FILES:= \
$(LINUX_DIR)/drivers/net/slip/slip.ko
$(LINUX_DIR)/drivers/net/slip/slip.ko
- else
- FILES:= \
- $(LINUX_DIR)/drivers/net/slip.ko
- endif
AUTOLOAD:=$(call AutoLoad,30,slip)
endef
AUTOLOAD:=$(call AutoLoad,30,slip)
endef
diff --git
a/package/kernel/modules/other.mk
b/package/kernel/modules/other.mk
index 64246eebf3c9cf5b5639caf3060606616678e19b..1bf1755d32f8c7446ab0f6b78434179246b01bf1 100644
(file)
--- 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
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
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
endef
define KernelPackage/serial-8250/description
diff --git
a/package/kernel/modules/pcmcia.mk
b/package/kernel/modules/pcmcia.mk
index a803a03dd8a22b6e648eadc39f46fca9823eebfc..cac727719c380a47cd68000ebe938dafa48aac78 100644
(file)
--- 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
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
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
AUTOLOAD:=$(call AutoLoad,45,serial_cs)
endef
diff --git
a/package/kernel/modules/usb.mk
b/package/kernel/modules/usb.mk
index 537149c36d86a49ad742a7a61a7c85b68477f150..143f7540f72ac0c35803dd5f230d9fbbf3467fd5 100644
(file)
--- 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
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
$(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
$(call AddDepends/nls)
endef
diff --git
a/package/kernel/modules/video.mk
b/package/kernel/modules/video.mk
index d5063e8250783134499e489f26d9d2531fcf66cd..4e0e7f30a630cc5048c5166263b2e6f95196c4d5 100644
(file)
--- 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
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)
KCONFIG:= CONFIG_USB_VIDEO_CLASS
FILES:=$(LINUX_DIR)/drivers/media/video/uvc/uvcvideo.ko
AUTOLOAD:=$(call AutoLoad,90,uvcvideo)