summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/gspca/Kconfig
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2009-09-17 10:26:50 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-09-17 10:26:50 -0300
commitf430c6a8909c2ec0e7802b492b2b75b85fe5f04e (patch)
treee6ad037cb199a3607affcf9fc158085be8bd50f9 /linux/drivers/media/video/gspca/Kconfig
parent307405f21d709dd8df9a479d1786d7a2697f1796 (diff)
parent216737d4199ef875a6a09256d760d09b4442f75a (diff)
downloadmediapointer-dvb-s2-f430c6a8909c2ec0e7802b492b2b75b85fe5f04e.tar.gz
mediapointer-dvb-s2-f430c6a8909c2ec0e7802b492b2b75b85fe5f04e.tar.bz2
merge: http://linuxtv.org/hg/~anttip/ce6230/
From: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/video/gspca/Kconfig')
-rw-r--r--linux/drivers/media/video/gspca/Kconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/linux/drivers/media/video/gspca/Kconfig b/linux/drivers/media/video/gspca/Kconfig
index 8897283b0..fe2e490eb 100644
--- a/linux/drivers/media/video/gspca/Kconfig
+++ b/linux/drivers/media/video/gspca/Kconfig
@@ -19,6 +19,7 @@ if USB_GSPCA && VIDEO_V4L2
source "drivers/media/video/gspca/m5602/Kconfig"
source "drivers/media/video/gspca/stv06xx/Kconfig"
+source "drivers/media/video/gspca/gl860/Kconfig"
config USB_GSPCA_CONEX
tristate "Conexant Camera Driver"