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 git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6
[sfrench/cifs-2.6.git]
/
drivers
/
media
/
video
/
em28xx
/
Makefile
diff --git
a/drivers/media/video/em28xx/Makefile
b/drivers/media/video/em28xx/Makefile
index 0924550992d0e4f37781bf66b5166ef30ce9a8de..3d1c3cc337fe65c7407d728afab04990bdcd4e98 100644
(file)
--- a/
drivers/media/video/em28xx/Makefile
+++ b/
drivers/media/video/em28xx/Makefile
@@
-5,6
+5,7
@@
em28xx-alsa-objs := em28xx-audio.o
obj-$(CONFIG_VIDEO_EM28XX) += em28xx.o
obj-$(CONFIG_VIDEO_EM28XX_ALSA) += em28xx-alsa.o
+obj-$(CONFIG_VIDEO_EM28XX_DVB) += em28xx-dvb.o
EXTRA_CFLAGS += -Idrivers/media/video
EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core