From fd1f4ec84f213f8c00855cd493a717aa891236a5 Mon Sep 17 00:00:00 2001 From: Hans Verkuil Date: Tue, 23 Dec 2008 15:02:16 -0300 Subject: [PATCH] --- yaml --- r: 125525 b: refs/heads/master c: 4ab9203b1b7e45f1beae7eb0c67d663a26257a69 h: refs/heads/master i: 125523: ae971b8dff9cd2c682fb16aef0f78699d79de2a6 v: v3 --- [refs] | 2 +- trunk/drivers/media/video/Makefile | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 23ae3f48fce4..73a53212cde5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c7dd09dabc278b03980c8e93d0eee3843b5ad514 +refs/heads/master: 4ab9203b1b7e45f1beae7eb0c67d663a26257a69 diff --git a/trunk/drivers/media/video/Makefile b/trunk/drivers/media/video/Makefile index 1611c33b1aee..72f6d03d2d8f 100644 --- a/trunk/drivers/media/video/Makefile +++ b/trunk/drivers/media/video/Makefile @@ -12,7 +12,10 @@ omap2cam-objs := omap24xxcam.o omap24xxcam-dma.o videodev-objs := v4l2-dev.o v4l2-ioctl.o v4l2-device.o v4l2-subdev.o -obj-$(CONFIG_VIDEO_DEV) += videodev.o v4l2-compat-ioctl32.o v4l2-int-device.o +obj-$(CONFIG_VIDEO_DEV) += videodev.o v4l2-int-device.o +ifeq ($(CONFIG_COMPAT),y) + obj-$(CONFIG_VIDEO_DEV) += v4l2-compat-ioctl32.o +endif obj-$(CONFIG_VIDEO_V4L2_COMMON) += v4l2-common.o