diff options
| author | hauke <hauke@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2011-03-19 17:42:48 +0000 |
|---|---|---|
| committer | hauke <hauke@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2011-03-19 17:42:48 +0000 |
| commit | fcc5705af1c2a8a07837c8ce59c2562697d5066e (patch) | |
| tree | 132592486de19a565c1e27d9fc27333b188b9a93 /package/kernel/modules/video.mk | |
| parent | 1c84f069b6bf766c644489b36326abd79208aac4 (diff) | |
kernel: fix some problems with kernel 2.6.38
In some places LINUX_2_6_38 was just missing.
Some kernel modules were moved.
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@26239 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/kernel/modules/video.mk')
| -rw-r--r-- | package/kernel/modules/video.mk | 23 |
1 files changed, 9 insertions, 14 deletions
diff --git a/package/kernel/modules/video.mk b/package/kernel/modules/video.mk index b148afc0e..7a6eb31a2 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 |