From 00b5f07a0a6243b073cfbdc39d4339e41fd0574e Mon Sep 17 00:00:00 2001
From: Adrian Bunk <bunk@kernel.org>
Date: Mon, 26 May 2008 14:23:49 -0300
Subject: [PATCH] --- yaml --- r: 97722 b: refs/heads/master c:
 45033bcf172d9965210b644f3769c9de94c33333 h: refs/heads/master v: v3

---
 [refs]                       | 2 +-
 trunk/drivers/media/Makefile | 7 +------
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 406e96e38684..17d107e67ee9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 38db143e6feaa2dc649ed8bf69d1a12f7b9c0246
+refs/heads/master: 45033bcf172d9965210b644f3769c9de94c33333
diff --git a/trunk/drivers/media/Makefile b/trunk/drivers/media/Makefile
index cc11c4c0e7e7..09a829d8a7e7 100644
--- a/trunk/drivers/media/Makefile
+++ b/trunk/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/