aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/media/video/Kconfig12
-rw-r--r--drivers/media/video/Makefile2
-rw-r--r--drivers/media/video/zc0301/Kconfig11
3 files changed, 12 insertions, 13 deletions
diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig
index 199d95bf85b5..af43f92d3a35 100644
--- a/drivers/media/video/Kconfig
+++ b/drivers/media/video/Kconfig
@@ -486,17 +486,7 @@ config USB_W9968CF
486 To compile this driver as a module, choose M here: the 486 To compile this driver as a module, choose M here: the
487 module will be called w9968cf. 487 module will be called w9968cf.
488 488
489config USB_ZC0301 489source "drivers/media/video/zc0301/Kconfig"
490 tristate "USB ZC0301 Image Processor and Control Chip support"
491 depends on USB && VIDEO_DEV
492 ---help---
493 Say Y here if you want support for cameras based on the ZC0301
494 Image Processor and Control Chip.
495
496 See <file:Documentation/usb/zc0301.txt> for more informations.
497
498 To compile this driver as a module, choose M here: the
499 module will be called zc0301.
500 490
501config USB_PWC 491config USB_PWC
502 tristate "USB Philips Cameras" 492 tristate "USB Philips Cameras"
diff --git a/drivers/media/video/Makefile b/drivers/media/video/Makefile
index 10c921f72548..e318b00fb386 100644
--- a/drivers/media/video/Makefile
+++ b/drivers/media/video/Makefile
@@ -65,8 +65,6 @@ obj-$(CONFIG_VIDEO_CX25840) += cx25840/
65obj-$(CONFIG_VIDEO_SAA711X) += saa7115.o 65obj-$(CONFIG_VIDEO_SAA711X) += saa7115.o
66obj-$(CONFIG_VIDEO_SAA7127) += saa7127.o 66obj-$(CONFIG_VIDEO_SAA7127) += saa7127.o
67 67
68zc0301-objs := zc0301_core.o zc0301_pas202bcb.o
69
70obj-$(CONFIG_USB_DABUSB) += dabusb.o 68obj-$(CONFIG_USB_DABUSB) += dabusb.o
71obj-$(CONFIG_USB_DSBR) += dsbr100.o 69obj-$(CONFIG_USB_DSBR) += dsbr100.o
72obj-$(CONFIG_USB_OV511) += ov511.o 70obj-$(CONFIG_USB_OV511) += ov511.o
diff --git a/drivers/media/video/zc0301/Kconfig b/drivers/media/video/zc0301/Kconfig
new file mode 100644
index 000000000000..b722840ee329
--- /dev/null
+++ b/drivers/media/video/zc0301/Kconfig
@@ -0,0 +1,11 @@
1config USB_ZC0301
2 tristate "USB ZC0301 Image Processor and Control Chip support"
3 depends on USB && VIDEO_DEV
4 ---help---
5 Say Y here if you want support for cameras based on the ZC0301
6 Image Processor and Control Chip.
7
8 See <file:Documentation/usb/zc0301.txt> for more informations.
9
10 To compile this driver as a module, choose M here: the
11 module will be called zc0301.