From aadec1ec9775228313c521943b8eeebc6d46c467 Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Sat, 19 Mar 2011 17:42:48 +0000 Subject: kernel: fix some problems with kernel 2.6.38 In some places LINUX_2_6_38 was just missing. Some kernel modules were moved. SVN-Revision: 26239 --- package/kernel/modules/video.mk | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-) (limited to 'package/kernel/modules/video.mk') 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 -- cgit v1.2.3