summaryrefslogtreecommitdiff
path: root/v4l/Makefile
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2009-09-13 12:13:52 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-09-13 12:13:52 -0300
commitbaf2c601d974ae7d46859426c35fdae28a0e7033 (patch)
treed9d70a45831ed7a0dc5c0686fb16e1028bc19c5d /v4l/Makefile
parentd65762ce274a5e3cfe393763b41e518ec26a5974 (diff)
parent4c691e7dabc47811013c7266fa5f32fe96687c36 (diff)
downloadmediapointer-dvb-s2-baf2c601d974ae7d46859426c35fdae28a0e7033.tar.gz
mediapointer-dvb-s2-baf2c601d974ae7d46859426c35fdae28a0e7033.tar.bz2
merge: http://linuxtv.org/hg/~anttip/af9015/
From: Mauro Carvalho Chehab <mchehab@redhat.com> Priority: normal Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'v4l/Makefile')
-rw-r--r--v4l/Makefile2
1 files changed, 2 insertions, 0 deletions
diff --git a/v4l/Makefile b/v4l/Makefile
index 29b9675ae..76d0bdd80 100644
--- a/v4l/Makefile
+++ b/v4l/Makefile
@@ -106,6 +106,7 @@ endif
ifeq ($(makefile-media),1)
-include $(obj)/Makefile.media
-include $(obj)/Makefile.sound
+-include $(obj)/Makefile.staging
endif
-include $(obj)/.kconfig.dep
@@ -278,6 +279,7 @@ links::
@echo creating symbolic links...
@find ../linux/drivers/media -name '*.[ch]' -type f -print0 | xargs -0n 255 ln -sf --target-directory=.
@find ../linux/sound -name '*.[ch]' -type f -print0 | xargs -0n 255 ln -sf --target-directory=.
+ @find ../linux/drivers/staging -name '*.[ch]' -type f -print0 | xargs -0n 255 ln -sf --target-directory=.
# This link is so code with #include "oss/*.h" will find its header files
oss: