various changes for kernel video support:

 * move kernel video related modules to a separate "Video Support" submenu and video.mk file
 * rename kmod-videodev to kmod-video-core
 * prefix all video modules with kmod-video-
 * add missing dependencies on USB support
 * rename kmod-usb-qc to kmod-video-quickcam


git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8806 3c298f89-4303-0410-b956-a3cf2f4a3e73

3 files changed, 79 insertions, 63 deletions

diff --git a/package/kernel/modules/other.mk b/package/kernel/modules/other.mk
index 280b5c4aa..a6b3f2d65 100644
--- a/package/kernel/modules/other.mk
+++ b/package/kernel/modules/other.mk
@@ -401,38 +401,6 @@ endef
 $(eval $(call KernelPackage,softdog))
 
 
-define KernelPackage/videodev
-  SUBMENU:=$(EMENU)
-  TITLE=Video4Linux support
-  KCONFIG:=CONFIG_VIDEO_DEV
-endef
-
-define KernelPackage/videodev/2.4
-  FILES:=$(LINUX_DIR)/drivers/media/video/videodev.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,60,videodev)
-endef
-
-define KernelPackage/videodev/2.6
-  FILES:= \
-	$(LINUX_DIR)/drivers/media/video/v4l2-common.$(LINUX_KMOD_SUFFIX) \
-	$(if $(CONFIG_VIDEO_V4L1_COMPAT),$(LINUX_DIR)/drivers/media/video/v4l1-compat.$(LINUX_KMOD_SUFFIX)) \
-	$(LINUX_DIR)/drivers/media/video/compat_ioctl32.$(LINUX_KMOD_SUFFIX) \
-	$(LINUX_DIR)/drivers/media/video/videodev.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,60, \
-	v4l2-common \
-	$(if $(CONFIG_VIDEO_V4L1_COMPAT),v4l1-compat) \
-	compat_ioctl32 \
-	videodev \
-  )
-endef
-
-define KernelPackage/videodev/description
- Kernel modules for Video4Linux support
-endef
-
-$(eval $(call KernelPackage,videodev))
-
-
 define KernelPackage/leds-net48xx
   SUBMENU:=$(EMENU)
   TITLE:=Soekris Net48xx LED support
diff --git a/package/kernel/modules/usb.mk b/package/kernel/modules/usb.mk
index f4f790be4..21f018ba0 100644
--- a/package/kernel/modules/usb.mk
+++ b/package/kernel/modules/usb.mk
@@ -448,37 +448,6 @@ endef
 $(eval $(call KernelPackage,ueagle-atm))
 
 
-define KernelPackage/usb-pwc
-  $(call usbdep,+kmod-videodev @LINUX_2_6)
-  TITLE:=Philips WebCam driver
-  KCONFIG:=CONFIG_USB_PWC CONFIG_VIDEO_V4L1=y CONFIG_VIDEO_CAPTURE_DRIVERS=y CONFIG_V4L_USB_DRIVERS=y CONFIG_USB_PWC_DEBUG=n
-  FILES:=$(LINUX_DIR)/drivers/media/video/pwc/pwc.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,70,pwc)
-endef
-
-
-define KernelPackage/usb-pwc/description
- Kernel modules for supporting Philips WebCam USB devices
-endef
-
-$(eval $(call KernelPackage,usb-pwc))
-
-
-define KernelPackage/cpia2
-  $(call usbdep,+kmod-videodev @LINUX_2_6)
-  TITLE:=CPIA2 video driver
-  KCONFIG:=CONFIG_VIDEO_CPIA2
-  FILES:=$(LINUX_DIR)/drivers/media/video/cpia2/cpia2.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,70,cpia2)
-endef
-
-define KernelPackage/cpia2/description
- Kernel modules for CPIA2 WebCam devices
-endef
-
-$(eval $(call KernelPackage,cpia2))
-
-
 define KernelPackage/usb-net
   $(call usbdep,)
   TITLE:=Kernel modules for USB-to-Ethernet convertors
diff --git a/package/kernel/modules/video.mk b/package/kernel/modules/video.mk
new file mode 100644
index 000000000..79ee7029f
--- /dev/null
+++ b/package/kernel/modules/video.mk
@@ -0,0 +1,79 @@
+#
+# Copyright (C) 2006 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+# $Id$
+
+VIDEO_MENU:=Video Support
+
+define KernelPackage/video-core
+  SUBMENU:=$(VIDEO_MENU)
+  TITLE=Video4Linux support
+  KCONFIG:= \
+	CONFIG_VIDEO_DEV \
+	CONFIG_VIDEO_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.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,60,videodev)
+endef
+
+define KernelPackage/video-core/2.6
+  FILES:= \
+	$(LINUX_DIR)/drivers/media/video/v4l2-common.$(LINUX_KMOD_SUFFIX) \
+	$(LINUX_DIR)/drivers/media/video/v4l1-compat.$(LINUX_KMOD_SUFFIX) \
+	$(LINUX_DIR)/drivers/media/video/compat_ioctl32.$(LINUX_KMOD_SUFFIX) \
+	$(LINUX_DIR)/drivers/media/video/videodev.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,60, \
+	v4l2-common \
+	v4l1-compat \
+	compat_ioctl32 \
+	videodev \
+  )
+endef
+
+define KernelPackage/video-core/description
+ Kernel modules for Video4Linux support
+endef
+
+$(eval $(call KernelPackage,video-core))
+
+
+define KernelPackage/video-pwc
+  SUBMENU:=$(VIDEO_MENU)
+  TITLE:=Philips webcam support
+  DEPENDS:=@LINUX_2_6 @USB_SUPPORT +kmod-usb-core +kmod-video-core
+  KCONFIG:= \
+	CONFIG_USB_PWC \
+	CONFIG_USB_PWC_DEBUG=n
+  FILES:=$(LINUX_DIR)/drivers/media/video/pwc/pwc.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,70,pwc)
+endef
+
+
+define KernelPackage/video-pwc/description
+ Kernel modules for supporting Philips USB based cameras.
+endef
+
+$(eval $(call KernelPackage,video-pwc))
+
+
+define KernelPackage/video-cpia2
+  SUBMENU:=$(VIDEO_MENU)
+  TITLE:=CPIA2 video driver
+  DEPENDS:=@LINUX_2_6 @USB_SUPPORT +kmod-usb-core +kmod-video-core
+  KCONFIG:=CONFIG_VIDEO_CPIA2
+  FILES:=$(LINUX_DIR)/drivers/media/video/cpia2/cpia2.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,70,cpia2)
+endef
+
+define KernelPackage/video-cpia2/description
+ Kernel modules for supporting CPIA2 USB based cameras.
+endef
+
+$(eval $(call KernelPackage,video-cpia2))