aboutsummaryrefslogtreecommitdiffstats
path: root/package/kernel
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2012-05-06 20:35:54 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2012-05-06 20:35:54 +0000
commit0fd86465d0e3f831504bbee9623d982dd8b6a799 (patch)
tree892fd5f5b1bb1b15894664772f1e709f10aee830 /package/kernel
parent655a320a6bd70629d0a031fa043985b5e2bb37d7 (diff)
downloadupstream-0fd86465d0e3f831504bbee9623d982dd8b6a799.tar.gz
upstream-0fd86465d0e3f831504bbee9623d982dd8b6a799.tar.bz2
upstream-0fd86465d0e3f831504bbee9623d982dd8b6a799.zip
kernel: add video-videobuf2
This should fix #11349 and #11142 SVN-Revision: 31630
Diffstat (limited to 'package/kernel')
-rw-r--r--package/kernel/modules/video.mk26
1 files changed, 24 insertions, 2 deletions
diff --git a/package/kernel/modules/video.mk b/package/kernel/modules/video.mk
index a7f508bb8e..e42e818fed 100644
--- a/package/kernel/modules/video.mk
+++ b/package/kernel/modules/video.mk
@@ -49,6 +49,28 @@ define AddDepends/video
endef
+define KernelPackage/video-videobuf2
+ TITLE:=videobuf2 lib
+ DEPENDS:= @!(LINUX_2_6_37||LINUX_2_6_38)
+ KCONFIG:= \
+ CONFIG_VIDEOBUF2_CORE \
+ CONFIG_VIDEOBUF2_MEMOPS \
+ CONFIG_VIDEOBUF2_VMALLOC
+ FILES:= \
+ $(LINUX_DIR)/drivers/media/video/videobuf2-core.ko \
+ $(LINUX_DIR)/drivers/media/video/videobuf2-memops.ko \
+ $(LINUX_DIR)/drivers/media/video/videobuf2-vmalloc.ko
+ AUTOLOAD:=$(call AutoLoad,65,videobuf2-core videobuf2-memops videobuf2-vmalloc)
+ $(call AddDepends/video)
+endef
+
+define KernelPackage/video-videobuf2/description
+ Kernel modules for supporting CPIA2 USB based cameras.
+endef
+
+$(eval $(call KernelPackage,video-videobuf2))
+
+
define KernelPackage/video-cpia2
TITLE:=CPIA2 video driver
DEPENDS:=@USB_SUPPORT +kmod-usb-core
@@ -85,7 +107,7 @@ $(eval $(call KernelPackage,video-sn9c102))
define KernelPackage/video-pwc
TITLE:=Philips USB webcam support
- DEPENDS:=@USB_SUPPORT +kmod-usb-core
+ DEPENDS:=@USB_SUPPORT +kmod-usb-core +!(LINUX_2_6_37||LINUX_2_6_38||LINUX_2_6_39||LINUX_3_0):kmod-video-videobuf2
KCONFIG:= \
CONFIG_USB_PWC \
CONFIG_USB_PWC_DEBUG=n
@@ -103,7 +125,7 @@ $(eval $(call KernelPackage,video-pwc))
define KernelPackage/video-uvc
TITLE:=USB Video Class (UVC) support
- DEPENDS:=@USB_SUPPORT +kmod-usb-core
+ DEPENDS:=@USB_SUPPORT +kmod-usb-core +!(LINUX_2_6_37||LINUX_2_6_38||LINUX_2_6_39||LINUX_3_0||LINUX_3_1||LINUX_3_2):kmod-video-videobuf2
KCONFIG:= CONFIG_USB_VIDEO_CLASS
FILES:=$(LINUX_DIR)/drivers/media/video/uvc/uvcvideo.ko
AUTOLOAD:=$(call AutoLoad,90,uvcvideo)