From 4c9cdc87d713501aeb1f5ccc247d2408993c8ce5 Mon Sep 17 00:00:00 2001
From: Michael Krufky <mkrufky@linuxtv.org>
Date: Wed, 29 Mar 2006 15:09:53 -0300
Subject: [PATCH] --- yaml --- r: 25151 b: refs/heads/master c:
 11bbb51cd0f95a303855d26b8f0e1c1c1ccdf83b h: refs/heads/master i:   25149:
 3893080e8e5fa23b7ab8fc0e97605c27dc01de09   25147:
 1ee6be3d0a0b73f2da97c06721fecb757d0d86b6   25143:
 5ac157c6dbbeb1aa2ef89c6d3a4559684e486567   25135:
 fd85c1ace3c5262e1a051291f2c75aab32828c64   25119:
 66424eb9f998d60f34c7da0c098302abcbbb0b52   25087:
 51d08bd9eeae8ea5aa4e70ac0429956f5e7ffdd8 v: v3

---
 [refs]                                   |  2 +-
 trunk/drivers/media/video/Kconfig        | 12 +-----------
 trunk/drivers/media/video/Makefile       |  2 --
 trunk/drivers/media/video/zc0301/Kconfig | 11 +++++++++++
 4 files changed, 13 insertions(+), 14 deletions(-)
 create mode 100644 trunk/drivers/media/video/zc0301/Kconfig

diff --git a/[refs] b/[refs]
index 2c3c8ebb4d59..2e83b4d614cb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e4a25edb5ecdf14aa14b909acc6f354e4c8f080c
+refs/heads/master: 11bbb51cd0f95a303855d26b8f0e1c1c1ccdf83b
diff --git a/trunk/drivers/media/video/Kconfig b/trunk/drivers/media/video/Kconfig
index 199d95bf85b5..af43f92d3a35 100644
--- a/trunk/drivers/media/video/Kconfig
+++ b/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"
diff --git a/trunk/drivers/media/video/Makefile b/trunk/drivers/media/video/Makefile
index 10c921f72548..e318b00fb386 100644
--- a/trunk/drivers/media/video/Makefile
+++ b/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
diff --git a/trunk/drivers/media/video/zc0301/Kconfig b/trunk/drivers/media/video/zc0301/Kconfig
new file mode 100644
index 000000000000..b722840ee329
--- /dev/null
+++ b/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.