From: Johannes Stezenbach <js@linuxtv.org>
Date: Fri, 9 Sep 2005 20:02:20 +0000 (-0700)
Subject: [PATCH] dvb: avoid building empty built-in.o
X-Git-Tag: v2.6.14-rc1~436
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3cc2176cbbee6adfaceac2df6d77312cf30cee83;p=linux-2.6

[PATCH] dvb: avoid building empty built-in.o

Don't build empty built-in.o when DVB/V4L is not configured.  Thanks to Sam
Ravnborg and Keith Owens.

Signed-off-by: Johannes Stezenbach <js@linuxtv.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
---

diff --git a/drivers/media/Makefile b/drivers/media/Makefile
index 772d6112fb..c578a529e7 100644
--- a/drivers/media/Makefile
+++ b/drivers/media/Makefile
@@ -2,4 +2,7 @@
 # Makefile for the kernel multimedia device drivers.
 #
 
-obj-y        := video/ radio/ dvb/ common/
+obj-y := common/
+obj-$(CONFIG_VIDEO_DEV) += video/
+obj-$(CONFIG_VIDEO_DEV) += radio/
+obj-$(CONFIG_DVB)       += dvb/