[-mm patch] fix VIDEO_DEV=m, VIDEO_V4L1_COMPAT=y

[Adrian Bunk]

On Tue, Apr 18, 2006 at 03:14:23AM -0700, Andrew Morton wrote:
>...
> Changes since 2.6.17-rc1-mm2:
>...
>  git-dvb.patch
>...
>  git trees
>...

If CONFIG_VIDEO_DEV=m and CONFIG_VIDEO_V4L1_COMPAT=y, v4l1-compat should 
be built as a module (currently, it isn't built at all leading to 
problems with modules using it).

Signed-off-by: Adrian Bunk <bunk@xxxxxxxxx>

--- linux-2.6.17-rc1-mm3-full/drivers/media/video/Makefile.old	2006-04-18 16:52:10.000000000 +0200
+++ linux-2.6.17-rc1-mm3-full/drivers/media/video/Makefile	2006-04-18 16:57:06.000000000 +0200
@@ -11,7 +11,10 @@
 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

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/