---

yaml
---
r: 25151
b: refs/heads/master
c: 11bbb51
h: refs/heads/master
i:
  25149: 3893080
  25147: 1ee6be3
  25143: 5ac157c
  25135: fd85c1a
  25119: 66424eb
  25087: 51d08bd
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e4a25edb5ecdf14aa14b909acc6f354e4c8f080c
+refs/heads/master: 11bbb51cd0f95a303855d26b8f0e1c1c1ccdf83b

trunk/drivers/media/video/Kconfig

@@ -486,17 +486,7 @@ config USB_W9968CF
 	  To compile this driver as a module, choose M here: the
 	  module will be called w9968cf.
 
-config USB_ZC0301
-	tristate "USB ZC0301 Image Processor and Control Chip support"
-	depends on USB && VIDEO_DEV
-	---help---
-	  Say Y here if you want support for cameras based on the ZC0301
-	  Image Processor and Control Chip.
-
-	  See <file:Documentation/usb/zc0301.txt> for more informations.
-
-	  To compile this driver as a module, choose M here: the
-	  module will be called zc0301.
+source "drivers/media/video/zc0301/Kconfig"
 
 config USB_PWC
 	tristate "USB Philips Cameras"

trunk/drivers/media/video/Makefile

@@ -65,8 +65,6 @@ obj-$(CONFIG_VIDEO_CX25840) += cx25840/
 obj-$(CONFIG_VIDEO_SAA711X) += saa7115.o
 obj-$(CONFIG_VIDEO_SAA7127) += saa7127.o
 
-zc0301-objs     := zc0301_core.o zc0301_pas202bcb.o
-
 obj-$(CONFIG_USB_DABUSB)        += dabusb.o
 obj-$(CONFIG_USB_DSBR)          += dsbr100.o
 obj-$(CONFIG_USB_OV511)         += ov511.o

trunk/drivers/media/video/zc0301/Kconfig

@@ -0,0 +1,11 @@
+config USB_ZC0301
+	tristate "USB ZC0301 Image Processor and Control Chip support"
+	depends on USB && VIDEO_DEV
+	---help---
+	  Say Y here if you want support for cameras based on the ZC0301
+	  Image Processor and Control Chip.
+
+	  See <file:Documentation/usb/zc0301.txt> for more informations.
+
+	  To compile this driver as a module, choose M here: the
+	  module will be called zc0301.