Skip to content

Commit

Permalink
V4L/DVB (7908): always enter drivers/media/video/
Browse files Browse the repository at this point in the history
After commit 039d400
(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>
  • Loading branch information
Adrian Bunk authored and Mauro Carvalho Chehab committed Jun 5, 2008
1 parent 38db143 commit 45033bc
Showing 1 changed file with 1 addition and 6 deletions.
7 changes: 1 addition & 6 deletions drivers/media/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,7 @@
# Makefile for the kernel multimedia device drivers.
#

obj-y := common/

obj-$(CONFIG_VIDEO_MEDIA) += common/

# Since hybrid devices are here, should be compiled if DVB and/or V4L
obj-$(CONFIG_VIDEO_MEDIA) += video/
obj-y += common/ video/

obj-$(CONFIG_VIDEO_DEV) += radio/
obj-$(CONFIG_DVB_CORE) += dvb/

0 comments on commit 45033bc

Please sign in to comment.