diff options
| author | Adrian Bunk <bunk@kernel.org> | 2008-05-26 13:23:49 -0400 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-06-05 05:35:42 -0400 |
| commit | 45033bcf172d9965210b644f3769c9de94c33333 (patch) | |
| tree | 4241fef9bd826a2f0bac027f76021d719c982c87 /drivers/media | |
| parent | 38db143e6feaa2dc649ed8bf69d1a12f7b9c0246 (diff) | |
V4L/DVB (7908): always enter drivers/media/video/
After commit 039d40019f3c5e26ea50ec5af4270189f63365e1
(V4L/DVB (7898): Fix VIDEO_MEDIA Kconfig logic)
VIDEO_MEDIA is no longer usable in Makefile's for deciding
which directories we enter, resulting in compile errors like the
following with CONFIG_VIDEO_DEV=y, CONFIG_DVB_CORE=m:
<-- snip -->
...
MODPOST 187 modules
...
make[2]: *** [__modpost] Error 1
<-- snip -->
The easiest solution is to always enter video/
Signed-off-by: Adrian Bunk <bunk@kernel.org>
Acked-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media')
| -rw-r--r-- | drivers/media/Makefile | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/media/Makefile b/drivers/media/Makefile index cc11c4c0e7e7..09a829d8a7e7 100644 --- a/drivers/media/Makefile +++ b/drivers/media/Makefile | |||
| @@ -2,12 +2,7 @@ | |||
| 2 | # Makefile for the kernel multimedia device drivers. | 2 | # Makefile for the kernel multimedia device drivers. |
| 3 | # | 3 | # |
| 4 | 4 | ||
| 5 | obj-y := common/ | 5 | obj-y += common/ video/ |
| 6 | |||
| 7 | obj-$(CONFIG_VIDEO_MEDIA) += common/ | ||
| 8 | |||
| 9 | # Since hybrid devices are here, should be compiled if DVB and/or V4L | ||
| 10 | obj-$(CONFIG_VIDEO_MEDIA) += video/ | ||
| 11 | 6 | ||
| 12 | obj-$(CONFIG_VIDEO_DEV) += radio/ | 7 | obj-$(CONFIG_VIDEO_DEV) += radio/ |
| 13 | obj-$(CONFIG_DVB_CORE) += dvb/ | 8 | obj-$(CONFIG_DVB_CORE) += dvb/ |