summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/Kconfig
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2008-02-05 10:31:13 -0200
committerMauro Carvalho Chehab <mchehab@infradead.org>2008-02-05 10:31:13 -0200
commit678c39afdb2904d63f5e55ce708e635c944892ce (patch)
tree07183685b46c23dc23a9334eacce4ebb5d071605 /linux/drivers/media/video/Kconfig
parentc239611668a3d8add80d686d266956a8fcac5ca4 (diff)
parentdebafa4c14110eb6c01ab9756953c5f9cd351f05 (diff)
downloadmediapointer-dvb-s2-678c39afdb2904d63f5e55ce708e635c944892ce.tar.gz
mediapointer-dvb-s2-678c39afdb2904d63f5e55ce708e635c944892ce.tar.bz2
merge: http://ifup.org/hg/v4l-dvb
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video/Kconfig')
-rw-r--r--linux/drivers/media/video/Kconfig9
1 files changed, 0 insertions, 9 deletions
diff --git a/linux/drivers/media/video/Kconfig b/linux/drivers/media/video/Kconfig
index c0498ac98..37072a21d 100644
--- a/linux/drivers/media/video/Kconfig
+++ b/linux/drivers/media/video/Kconfig
@@ -836,13 +836,4 @@ config USB_STKWEBCAM
endif # V4L_USB_DRIVERS
-config SOC_CAMERA
- tristate "SoC camera support"
- depends on VIDEO_V4L2
- select VIDEOBUF_DMA_SG
- help
- SoC Camera is a common API to several cameras, not connecting
- over a bus like PCI or USB. For example some i2c camera connected
- directly to the data bus of an SoC.
-
endif # VIDEO_CAPTURE_DRIVERS