3 files changed, 45 insertions, 38 deletions

diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig
index e585340349c..fbb2a490574 100644
--- a/drivers/media/video/Kconfig
+++ b/drivers/media/video/Kconfig
@@ -374,15 +374,6 @@ menu "V4L USB devices"
 
 source "drivers/media/video/em28xx/Kconfig"
 
-config USB_VICAM
-        tristate "USB 3com HomeConnect (aka vicam) support (EXPERIMENTAL)"
-        depends on USB && VIDEO_DEV && EXPERIMENTAL
-        ---help---
-          Say Y here if you have 3com homeconnect camera (vicam).
-
-          To compile this driver as a module, choose M here: the
-          module will be called vicam.
-
 config USB_DSBR
         tristate "D-Link USB FM radio support (EXPERIMENTAL)"
         depends on USB && VIDEO_DEV && EXPERIMENTAL
@@ -395,32 +386,9 @@ config USB_DSBR
           To compile this driver as a module, choose M here: the
           module will be called dsbr100.
 
-source "drivers/media/video/et61x251/Kconfig"
-
-config USB_IBMCAM
-        tristate "USB IBM (Xirlink) C-it Camera support"
-        depends on USB && VIDEO_DEV
-        ---help---
-          Say Y here if you want to connect a IBM "C-It" camera, also known as
-          "Xirlink PC Camera" to your computer's USB port.  For more
-          information, read <file:Documentation/usb/ibmcam.txt>.
+source "drivers/media/video/usbvideo/Kconfig"
 
-          To compile this driver as a module, choose M here: the
-          module will be called ibmcam.
-
-          This camera has several configuration options which
-          can be specified when you load the module. Read
-          <file:Documentation/usb/ibmcam.txt> to learn more.
-
-config USB_KONICAWC
-        tristate "USB Konica Webcam support"
-        depends on USB && VIDEO_DEV
-        ---help---
-          Say Y here if you want support for webcams based on a Konica
-          chipset. This is known to work with the Intel YC76 webcam.
-
-          To compile this driver as a module, choose M here: the
-          module will be called konicawc.
+source "drivers/media/video/et61x251/Kconfig"
 
 config USB_OV511
         tristate "USB OV511 Camera support"
diff --git a/drivers/media/video/usbvideo/Kconfig b/drivers/media/video/usbvideo/Kconfig
new file mode 100644
index 00000000000..bb0d1fa4eac
--- /dev/null
+++ b/drivers/media/video/usbvideo/Kconfig
@@ -0,0 +1,39 @@
+config VIDEO_USBVIDEO
+        tristate
+
+config USB_VICAM
+        tristate "USB 3com HomeConnect (aka vicam) support (EXPERIMENTAL)"
+        depends on USB && VIDEO_DEV && EXPERIMENTAL
+        select VIDEO_USBVIDEO
+        ---help---
+          Say Y here if you have 3com homeconnect camera (vicam).
+
+          To compile this driver as a module, choose M here: the
+          module will be called vicam.
+
+config USB_IBMCAM
+        tristate "USB IBM (Xirlink) C-it Camera support"
+        depends on USB && VIDEO_DEV
+        select VIDEO_USBVIDEO
+        ---help---
+          Say Y here if you want to connect a IBM "C-It" camera, also known as
+          "Xirlink PC Camera" to your computer's USB port.  For more
+          information, read <file:Documentation/usb/ibmcam.txt>.
+
+          To compile this driver as a module, choose M here: the
+          module will be called ibmcam.
+
+          This camera has several configuration options which
+          can be specified when you load the module. Read
+          <file:Documentation/usb/ibmcam.txt> to learn more.
+
+config USB_KONICAWC
+        tristate "USB Konica Webcam support"
+        depends on USB && VIDEO_DEV
+        select VIDEO_USBVIDEO
+        ---help---
+          Say Y here if you want support for webcams based on a Konica
+          chipset. This is known to work with the Intel YC76 webcam.
+
+          To compile this driver as a module, choose M here: the
+          module will be called konicawc.
diff --git a/drivers/media/video/usbvideo/Makefile b/drivers/media/video/usbvideo/Makefile
index ed410a5ee8c..bb52eb8dc2f 100644
--- a/drivers/media/video/usbvideo/Makefile
+++ b/drivers/media/video/usbvideo/Makefile
@@ -1,4 +1,4 @@
-obj-$(CONFIG_USB_IBMCAM)        += ibmcam.o usbvideo.o ultracam.o
-obj-$(CONFIG_USB_KONICAWC)      += konicawc.o usbvideo.o
-obj-$(CONFIG_USB_VICAM)         += vicam.o usbvideo.o
-
+obj-$(CONFIG_VIDEO_USBVIDEO)    += usbvideo.o
+obj-$(CONFIG_USB_IBMCAM)        += ibmcam.o ultracam.o
+obj-$(CONFIG_USB_KONICAWC)      += konicawc.o
+obj-$(CONFIG_USB_VICAM)         += vicam.o