summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/Kconfig
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2009-09-17 10:01:48 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-09-17 10:01:48 -0300
commitf8c7dcdb0142ecb0a9634945df8bd9b26522f5b7 (patch)
treed7703789255579bf70057a82a8c8c801026014e4 /linux/drivers/media/video/Kconfig
parent7559277af1cad4b8427f05c97fa35f0602e6232e (diff)
parent960dd433677f556b9eed1185b4fc7442ff6b9c63 (diff)
downloadmediapointer-dvb-s2-f8c7dcdb0142ecb0a9634945df8bd9b26522f5b7.tar.gz
mediapointer-dvb-s2-f8c7dcdb0142ecb0a9634945df8bd9b26522f5b7.tar.bz2
merge: http://www.kernellabs.com/hg/~stoth/saa7164-merge
From: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/video/Kconfig')
-rw-r--r--linux/drivers/media/video/Kconfig2
1 files changed, 2 insertions, 0 deletions
diff --git a/linux/drivers/media/video/Kconfig b/linux/drivers/media/video/Kconfig
index 298eb937e..dc71eaea6 100644
--- a/linux/drivers/media/video/Kconfig
+++ b/linux/drivers/media/video/Kconfig
@@ -772,6 +772,8 @@ source "drivers/media/video/ivtv/Kconfig"
source "drivers/media/video/cx18/Kconfig"
+source "drivers/media/video/saa7164/Kconfig"
+
config VIDEO_M32R_AR
tristate "AR devices"
depends on M32R && VIDEO_V4L1