diff options
| author | Adrian Bunk <bunk@stusta.de> | 2006-05-23 14:56:20 -0400 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-05-23 14:56:20 -0400 |
| commit | 9d8a51f80117a9d672b455d60901842ad50aa69f (patch) | |
| tree | 6f5ab1b191a056cf36d45028ae6664983735a17b /drivers/media | |
| parent | 1faadface9c5d000bb16e42c89f24859337cf2db (diff) | |
V4L/DVB (3927): Fix VIDEO_DEV=m, VIDEO_V4L1_COMPAT=y
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@stusta.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media')
| -rw-r--r-- | drivers/media/video/Makefile | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/media/video/Makefile b/drivers/media/video/Makefile index 9debef9be8c8..e5bf2687b76d 100644 --- a/drivers/media/video/Makefile +++ b/drivers/media/video/Makefile | |||
| @@ -11,7 +11,10 @@ tuner-objs := tuner-core.o tuner-types.o tuner-simple.o \ | |||
| 11 | msp3400-objs := msp3400-driver.o msp3400-kthreads.o | 11 | msp3400-objs := msp3400-driver.o msp3400-kthreads.o |
| 12 | 12 | ||
| 13 | obj-$(CONFIG_VIDEO_DEV) += videodev.o v4l2-common.o compat_ioctl32.o | 13 | obj-$(CONFIG_VIDEO_DEV) += videodev.o v4l2-common.o compat_ioctl32.o |
| 14 | obj-$(CONFIG_VIDEO_V4L1_COMPAT) += v4l1-compat.o | 14 | |
| 15 | ifeq ($(CONFIG_VIDEO_V4L1_COMPAT),y) | ||
| 16 | obj-$(CONFIG_VIDEO_DEV) += v4l1-compat.o | ||
| 17 | endif | ||
| 15 | 18 | ||
| 16 | obj-$(CONFIG_VIDEO_BT848) += bt8xx/ | 19 | obj-$(CONFIG_VIDEO_BT848) += bt8xx/ |
| 17 | obj-$(CONFIG_VIDEO_BT848) += tvaudio.o tda7432.o tda9875.o ir-kbd-i2c.o | 20 | obj-$(CONFIG_VIDEO_BT848) += tvaudio.o tda7432.o tda9875.o ir-kbd-i2c.o |