diff options
| author | Hans Verkuil <hverkuil@xs4all.nl> | 2009-09-10 19:58:39 +0200 |
|---|---|---|
| committer | Hans Verkuil <hverkuil@xs4all.nl> | 2009-09-10 19:58:39 +0200 |
| commit | a8f908ae4e4df8c18b0fe87bfae722392b5429d8 (patch) | |
| tree | aa4c957f41b67799fa257fb952709377c72f032c /v4l/Makefile | |
| parent | f3fb970832182809d9bf8b397fe34f70404e51fd (diff) | |
| download | mediapointer-dvb-s2-a8f908ae4e4df8c18b0fe87bfae722392b5429d8.tar.gz mediapointer-dvb-s2-a8f908ae4e4df8c18b0fe87bfae722392b5429d8.tar.bz2 | |
v4l: Merge drivers/staging/go7007 in v4l-dvb.
From: Hans Verkuil <hverkuil@xs4all.nl>
Having go7007 as part of v4l-dvb makes it easier to continue developing
this driver.
Priority: normal
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Diffstat (limited to 'v4l/Makefile')
| -rw-r--r-- | v4l/Makefile | 2 |
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: |