From a8f908ae4e4df8c18b0fe87bfae722392b5429d8 Mon Sep 17 00:00:00 2001 From: Hans Verkuil Date: Thu, 10 Sep 2009 19:58:39 +0200 Subject: v4l: Merge drivers/staging/go7007 in v4l-dvb. From: Hans Verkuil Having go7007 as part of v4l-dvb makes it easier to continue developing this driver. Priority: normal Signed-off-by: Hans Verkuil --- v4l/Makefile | 2 ++ 1 file changed, 2 insertions(+) (limited to 'v4l/Makefile') 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: -- cgit v1.2.3