git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'pci_id_updates' of git://git.kernel.org/pub/scm/linux/kernel/git/mcheha...
[sfrench/cifs-2.6.git]
/
drivers
/
media
/
Makefile
diff --git
a/drivers/media/Makefile
b/drivers/media/Makefile
index c578a529e7a8e910ea969b3fad2c58b28d95ca2d..7b8bb6949f5e877262312666a4991bf46c957c81 100644
(file)
--- a/
drivers/media/Makefile
+++ b/
drivers/media/Makefile
@@
-3,6
+3,9
@@
#
obj-y := common/
-obj-
$(CONFIG_VIDEO_DEV)
+= video/
+obj-
y
+= video/
obj-$(CONFIG_VIDEO_DEV) += radio/
-obj-$(CONFIG_DVB) += dvb/
+obj-$(CONFIG_DVB_CORE) += dvb/
+ifeq ($(CONFIG_DVB_CORE),)
+ obj-$(CONFIG_VIDEO_TUNER) += dvb/frontends/
+endif