diff options
| -rw-r--r-- | package/kernel/modules/netsupport.mk | 6 | ||||
| -rw-r--r-- | package/kernel/modules/pcmcia.mk | 15 | ||||
| -rw-r--r-- | package/kernel/modules/usb.mk | 4 | ||||
| -rw-r--r-- | package/kernel/modules/video.mk | 23 |
4 files changed, 19 insertions, 29 deletions
diff --git a/package/kernel/modules/netsupport.mk b/package/kernel/modules/netsupport.mk index 0116283045..3a1a3b4c4f 100644 --- a/package/kernel/modules/netsupport.mk +++ b/package/kernel/modules/netsupport.mk @@ -489,9 +489,9 @@ $(eval $(call KernelPackage,pptp)) define KernelPackage/pppol2tp SUBMENU:=$(NETWORK_SUPPORT_MENU) TITLE:=PPPoL2TP support - DEPENDS:=kmod-ppp +kmod-pppoe +LINUX_2_6_35||LINUX_2_6_36||LINUX_2_6_37:kmod-l2tp + DEPENDS:=kmod-ppp +kmod-pppoe +LINUX_2_6_35||LINUX_2_6_36||LINUX_2_6_37||LINUX_2_6_38:kmod-l2tp KCONFIG:=CONFIG_PPPOL2TP - ifneq ($(CONFIG_LINUX_2_6_35)$(CONFIG_LINUX_2_6_36)$(CONFIG_LINUX_2_6_37),) + ifneq ($(CONFIG_LINUX_2_6_35)$(CONFIG_LINUX_2_6_36)$(CONFIG_LINUX_2_6_37)$(CONFIG_LINUX_2_6_38),) FILES:=$(LINUX_DIR)/net/l2tp/l2tp_ppp.ko AUTOLOAD:=$(call AutoLoad,40,l2tp_ppp) else @@ -651,7 +651,7 @@ $(eval $(call KernelPackage,pktgen)) define KernelPackage/l2tp SUBMENU:=$(NETWORK_SUPPORT_MENU) - DEPENDS:=@LINUX_2_6_35||LINUX_2_6_36||LINUX_2_6_37 + DEPENDS:=@LINUX_2_6_35||LINUX_2_6_36||LINUX_2_6_37||LINUX_2_6_38 TITLE:=Layer Two Tunneling Protocol (L2TP) KCONFIG:=CONFIG_L2TP \ CONFIG_L2TP_V3=y \ diff --git a/package/kernel/modules/pcmcia.mk b/package/kernel/modules/pcmcia.mk index c7cc8f8abc..8b23934d31 100644 --- a/package/kernel/modules/pcmcia.mk +++ b/package/kernel/modules/pcmcia.mk @@ -78,19 +78,14 @@ define KernelPackage/pcmcia-serial KCONFIG:= \ CONFIG_PCMCIA_SERIAL_CS \ CONFIG_SERIAL_8250_CS + ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,2.6.38)),1) + FILES:=$(LINUX_DIR)/drivers/tty/serial/serial_cs.ko + else + FILES:=$(LINUX_DIR)/drivers/serial/serial_cs.ko + endif AUTOLOAD:=$(call AutoLoad,45,serial_cs) endef -define KernelPackage/pcmcia-serial/2.4 -# KCONFIG:=CONFIG_PCMCIA_SERIAL_CS - FILES:=$(LINUX_DIR)/drivers/char/pcmcia/serial_cs.ko -endef - -define KernelPackage/pcmcia-serial/2.6 -# KCONFIG:=CONFIG_SERIAL_8250_CS - FILES:=$(LINUX_DIR)/drivers/serial/serial_cs.ko -endef - define KernelPackage/pcmcia-serial/description Kernel support for PCMCIA/CardBus serial devices endef diff --git a/package/kernel/modules/usb.mk b/package/kernel/modules/usb.mk index da452a6463..a3f7d2eda9 100644 --- a/package/kernel/modules/usb.mk +++ b/package/kernel/modules/usb.mk @@ -544,7 +544,7 @@ $(eval $(call KernelPackage,usb-serial-keyspan)) define KernelPackage/usb-serial-wwan TITLE:=Support for GSM and CDMA modems - DEPENDS:= @LINUX_2_6_35||LINUX_2_6_36||LINUX_2_6_37 + DEPENDS:= @LINUX_2_6_35||LINUX_2_6_36||LINUX_2_6_37||LINUX_2_6_38 KCONFIG:=CONFIG_USB_SERIAL_WWAN FILES:=$(LINUX_DIR)/drivers/usb/serial/usb_wwan.ko AUTOLOAD:=$(call AutoLoad,61,usb_wwan) @@ -560,7 +560,7 @@ $(eval $(call KernelPackage,usb-serial-wwan)) define KernelPackage/usb-serial-option TITLE:=Support for Option HSDPA modems - DEPENDS:=+LINUX_2_6_35||LINUX_2_6_36||LINUX_2_6_37:kmod-usb-serial-wwan + DEPENDS:=+LINUX_2_6_35||LINUX_2_6_36||LINUX_2_6_37||LINUX_2_6_38:kmod-usb-serial-wwan KCONFIG:=CONFIG_USB_SERIAL_OPTION FILES:=$(LINUX_DIR)/drivers/usb/serial/option.ko AUTOLOAD:=$(call AutoLoad,65,option) diff --git a/package/kernel/modules/video.mk b/package/kernel/modules/video.mk index b148afc0e1..7a6eb31a2a 100644 --- a/package/kernel/modules/video.mk +++ b/package/kernel/modules/video.mk @@ -18,24 +18,19 @@ define KernelPackage/video-core CONFIG_VIDEO_V4L1=y \ CONFIG_VIDEO_ALLOW_V4L1=y \ CONFIG_VIDEO_CAPTURE_DRIVERS=y \ - CONFIG_V4L_USB_DRIVERS=y -endef - -define KernelPackage/video-core/2.4 - FILES:=$(LINUX_DIR)/drivers/media/video/videodev.ko - AUTOLOAD:=$(call AutoLoad,60,videodev) -endef - -define KernelPackage/video-core/2.6 + CONFIG_V4L_USB_DRIVERS=y +ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,2.6.38)),1) + FILES:= \ + $(LINUX_DIR)/drivers/media/video/v4l2-common.ko \ + $(LINUX_DIR)/drivers/media/video/videodev.ko + AUTOLOAD:=$(call AutoLoad,60, videodev v4l2-common) +else FILES:= \ $(LINUX_DIR)/drivers/media/video/v4l2-common.ko \ $(LINUX_DIR)/drivers/media/video/v4l1-compat.ko \ $(LINUX_DIR)/drivers/media/video/videodev.ko - AUTOLOAD:=$(call AutoLoad,60, \ - v4l1-compat \ - videodev \ - v4l2-common \ - ) + AUTOLOAD:=$(call AutoLoad,60, v4l1-compat videodev v4l2-common) +endif endef define KernelPackage/video-core/description |