7 files changed, 102 insertions, 87 deletions
diff --git a/package/kernel/modules/other.mk b/package/kernel/modules/other.mk
index 280b5c4aa9..a6b3f2d651 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 f4f790be47..21f018ba0f 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 0000000000..79ee7029f5
--- /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))
diff --git a/package/qc-usb/Makefile b/package/qc-usb/Makefile
index 3ae5061322..a1a16b34cb 100644
--- a/package/qc-usb/Makefile
+++ b/package/qc-usb/Makefile
@@ -4,7 +4,7 @@
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id: $
+# $Id$
 
 include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
@@ -35,21 +35,21 @@ define Package/qc-usb-utils/description
  These programs are completely useless without a qc-usb-modules package.
 endef
 
-define KernelPackage/usb-qc
+define KernelPackage/video-quickcam
 $(call Package/qc-usb/Default)
-  TITLE:=Support for USB QuickCam Express webcam
-  SUBMENU:=USB Support
-  DEPENDS:=@LINUX_2_6 @USB_SUPPORT kmod-usb-core +kmod-videodev
+  SUBMENU:=Video Support
+  TITLE:=USB QuickCam Express webcam support
+  DEPENDS:=@LINUX_2_6 @USB_SUPPORT +kmod-usb-core +kmod-video-core
   FILES:=$(PKG_BUILD_DIR)/quickcam.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,90,quickcam)
 endef
 
-define KernelPackage/usb-qc/description
+define KernelPackage/video-quickcam/description
  Kernel support for Logitech's QuickCam Express webcam and other webcams 
  with similar chipsets.
 endef
 
-ifneq ($(CONFIG_PACKAGE_kmod-usb-qc),)
+ifneq ($(CONFIG_PACKAGE_kmod-video-quickcam),)
   define Build/Compile/kmod
 	$(MAKE) -C $(LINUX_DIR) \
 		PATH="$(TARGET_PATH)" \
@@ -66,7 +66,6 @@ endif
 
 define Build/Compile
 	$(call Build/Compile/kmod)
-
 	$(MAKE) -C $(PKG_BUILD_DIR) \
 		CFLAGS="$(TARGET_CFLAGS)" \
 		qcset
@@ -78,4 +77,4 @@ define Package/qc-usb-utils/install
 endef
 
 $(eval $(call BuildPackage,qc-usb-utils))
-$(eval $(call KernelPackage,usb-qc))
+$(eval $(call KernelPackage,video-quickcam))
diff --git a/package/spca5xx-le/Makefile b/package/spca5xx-le/Makefile
index 9807c2c1e6..e3c0d285ca 100644
--- a/package/spca5xx-le/Makefile
+++ b/package/spca5xx-le/Makefile
@@ -20,10 +20,10 @@ PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME)
 
 include $(INCLUDE_DIR)/package.mk
 
-define KernelPackage/spca5xx-le
-  SUBMENU:=Other modules
-  DEPENDS:=@LINUX_2_6 kmod-videodev
-  TITLE:=Driver for SPCA5xx based USB cameras (Light Edition)
+define KernelPackage/video-spca5xx-le
+  SUBMENU:=Video Support
+  DEPENDS:=@LINUX_2_6 @USB_SUPPORT +kmod-usb-core +kmod-video-core
+  TITLE:=SPCA5xx based USB webcam support (Light Edition)
   URL:=http://mxhaard.free.fr/
   FILES:=$(PKG_BUILD_DIR)/spca5xx.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,90,spca5xx)
@@ -40,4 +40,4 @@ define Build/Compile
 		modules
 endef
 
-$(eval $(call KernelPackage,spca5xx-le))
+$(eval $(call KernelPackage,video-spca5xx-le))
diff --git a/package/spca5xx/Makefile b/package/spca5xx/Makefile
index 85e21ef27f..3d48b7e3dd 100644
--- a/package/spca5xx/Makefile
+++ b/package/spca5xx/Makefile
@@ -19,10 +19,10 @@ PKG_MD5SUM:=e18a21b80e1728c6b51b799d1e671f8c
 
 include $(INCLUDE_DIR)/package.mk
 
-define KernelPackage/gspca
-  SUBMENU:=Other modules
-  DEPENDS:=@LINUX_2_6 kmod-usb-core kmod-videodev
-  TITLE:=Driver for SPCA5xx based USB cameras
+define KernelPackage/video-gspca
+  SUBMENU:=Video Support
+  DEPENDS:=@LINUX_2_6 @USB_SUPPORT +kmod-usb-core +kmod-video-core
+  TITLE:=SPCA5xx based USB webcam support
   URL:=http://mxhaard.free.fr/
   FILES:=$(PKG_BUILD_DIR)/gspca.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,90,gspca)
@@ -39,4 +39,4 @@ define Build/Compile
 		modules
 endef
 
-$(eval $(call KernelPackage,gspca))
+$(eval $(call KernelPackage,video-gspca))
diff --git a/package/uvcvideo/Makefile b/package/uvcvideo/Makefile
index c08f565d7f..97e2924466 100644
--- a/package/uvcvideo/Makefile
+++ b/package/uvcvideo/Makefile
@@ -19,10 +19,10 @@ PKG_MD5SUM:=36c742d9dd1cf533fa059a1eeffa3e32
 
 include $(INCLUDE_DIR)/package.mk
 
-define KernelPackage/uvcvideo
-  SUBMENU:=USB Support
-  DEPENDS:=@LINUX_2_6 kmod-usb-core kmod-videodev
-  TITLE:=Driver for Linux-UVC based USB cameras
+define KernelPackage/video-uvc
+  SUBMENU:=Video Support
+  DEPENDS:=@LINUX_2_6 @USB_SUPPORT +kmod-usb-core +kmod-video-core
+  TITLE:=Linux-UVC based USB webcam support
   URL:=http://linux-uvc.berlios.de/
   FILES:=$(PKG_BUILD_DIR)/uvcvideo.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,90,uvcvideo)
@@ -39,4 +39,4 @@ define Build/Compile
 		modules
 endef
 
-$(eval $(call KernelPackage,uvcvideo))
+$(eval $(call KernelPackage,video-uvc))