From 1a474f411c32c791303f0957a7b7c0d4f80fdb0b Mon Sep 17 00:00:00 2001 From: Adrian Bunk Date: Tue, 23 May 2006 15:56:20 -0300 Subject: [PATCH] --- yaml --- r: 26943 b: refs/heads/master c: 9d8a51f80117a9d672b455d60901842ad50aa69f h: refs/heads/master i: 26941: 80551e566cc139237ff0e9214f17a8fa84a03964 26939: 0a96e027953a6d20d6a36ad2cd4f91714137920f 26935: d83221d0edc5281bd5e957c62c3737d325091eb3 26927: 9504390e302126ea408134325b875ec004a5edc7 26911: 1fd6ba8932c3d148e52f64630345a0fd9bcd43fc 26879: 7ba7acba1bdeb4c94b7ac029bc3eb65fe3d94cf0 v: v3 --- [refs] | 2 +- trunk/drivers/media/video/Makefile | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 2eefdcd106b6..7ae37145a5ec 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1faadface9c5d000bb16e42c89f24859337cf2db +refs/heads/master: 9d8a51f80117a9d672b455d60901842ad50aa69f diff --git a/trunk/drivers/media/video/Makefile b/trunk/drivers/media/video/Makefile index 9debef9be8c8..e5bf2687b76d 100644 --- a/trunk/drivers/media/video/Makefile +++ b/trunk/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