[2.6 patch] always enter drivers/media/video/

[Adrian Bunk]

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
ERROR: "video_exclusive_release" [drivers/media/radio/radio-zoltrix.ko] undefined!
ERROR: "video_exclusive_open" [drivers/media/radio/radio-zoltrix.ko] undefined!
ERROR: "video_ioctl2" [drivers/media/radio/radio-zoltrix.ko] undefined!
ERROR: "video_register_device" [drivers/media/radio/radio-zoltrix.ko] undefined!
ERROR: "video_devdata" [drivers/media/radio/radio-zoltrix.ko] undefined!
ERROR: "video_unregister_device" [drivers/media/radio/radio-zoltrix.ko] undefined!
...
make[2]: *** [__modpost] Error 1

<--  snip  -->

The easiest solution is to always enter video/

Reported-by: Toralf FÃrster <toralf.foerster@xxxxxx>
Signed-off-by: Adrian Bunk <bunk@xxxxxxxxxx>

---
62aa0f0990ec569868b34764c255268a5e425486 diff --git a/drivers/media/Makefile b/drivers/media/Makefile
index cc11c4c..09a829d 100644
--- a/drivers/media/Makefile
+++ b/drivers/media/Makefile
@@ -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/
--
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/