summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/Makefile
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2006-04-28 10:14:45 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2006-04-28 10:14:45 -0300
commit1c961da3e212de0774ee0b7690d00f79bb2a1c2a (patch)
treef26cd97b2727250b932d2e71f1cbae7df9799a28 /linux/drivers/media/video/Makefile
parente362706b3e90987c5ca839def8372bff58fea7c0 (diff)
parent34d92c680b74d3f3bd566b52873649bc3fe0dd4f (diff)
downloadmediapointer-dvb-s2-1c961da3e212de0774ee0b7690d00f79bb2a1c2a.tar.gz
mediapointer-dvb-s2-1c961da3e212de0774ee0b7690d00f79bb2a1c2a.tar.bz2
merge: http://linuxtv.org/hg/~mcisely/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/Makefile')
-rw-r--r--linux/drivers/media/video/Makefile6
1 files changed, 5 insertions, 1 deletions
diff --git a/linux/drivers/media/video/Makefile b/linux/drivers/media/video/Makefile
index bd3f1a006..ad54ecdd7 100644
--- a/linux/drivers/media/video/Makefile
+++ b/linux/drivers/media/video/Makefile
@@ -11,7 +11,10 @@ tuner-objs := tuner-core.o tuner-types.o tuner-simple.o \
msp3400-objs := msp3400-driver.o msp3400-kthreads.o
obj-$(CONFIG_VIDEO_DEV) += videodev.o v4l2-common.o compat_ioctl32.o
-obj-$(CONFIG_VIDEO_V4L1_COMPAT) += v4l1-compat.o
+
+ifeq ($(CONFIG_VIDEO_V4L1_COMPAT),y)
+ obj-$(CONFIG_VIDEO_DEV) += v4l1-compat.o
+endif
obj-$(CONFIG_VIDEO_BT848) += bt8xx/
obj-$(CONFIG_VIDEO_BT848) += tvaudio.o tda7432.o tda9875.o ir-kbd-i2c.o
@@ -30,6 +33,7 @@ obj-$(CONFIG_VIDEO_ZORAN_DC30) += adv7175.o vpx3220.o zr36050.o \
zr36016.o
obj-$(CONFIG_VIDEO_ZORAN_LML33) += bt819.o bt856.o zr36060.o
obj-$(CONFIG_VIDEO_ZORAN_LML33R10) += saa7114.o adv7170.o zr36060.o
+obj-$(CONFIG_VIDEO_ZORAN_AVS6EYES) += bt866.o ks0127.o zr36060.o
obj-$(CONFIG_VIDEO_ZORAN) += zr36067.o videocodec.o
obj-$(CONFIG_VIDEO_PMS) += pms.o
obj-$(CONFIG_VIDEO_PLANB) += planb.o