diff options
Diffstat (limited to 'v4l')
| -rw-r--r-- | v4l/Makefile | 15 | ||||
| -rwxr-xr-x | v4l/scripts/strip-trailing-whitespaces.sh | 2 | ||||
| -rw-r--r-- | v4l/versions.txt | 4 |
3 files changed, 14 insertions, 7 deletions
diff --git a/v4l/Makefile b/v4l/Makefile index 52ca3ec54..da51bb50a 100644 --- a/v4l/Makefile +++ b/v4l/Makefile @@ -48,6 +48,12 @@ default:: config-compat.h Makefile.media links oss firmware:: $(MAKE) -C firmware +spec:: + $(MAKE) -C ../v4l2-spec + +apps:: + $(MAKE) -C ../v4l2-apps + ################################################# # Object specific rules @@ -265,6 +271,7 @@ config-compat.h:: $(obj)/.version .myconfig scripts/make_config_compat.pl kernel-links makelinks:: cd ..; v4l/scripts/makelinks.sh $(SRCDIR) + ################################################# # Cardlist updating rule @@ -279,7 +286,9 @@ clean:: @find . -name '*.h' -type l -exec rm '{}' \; -rm -f *~ *.o *.ko .*.o.cmd .*.ko.cmd *.mod.c av7110_firm.h fdump \ config-compat.h Module.symvers Module.markers modules.order - make -C firmware clean + $(MAKE) -C firmware $@ + $(MAKE) -C ../v4l2-spec $@ + $(MAKE) -C ../v4l2-apps $@ distclean:: clean -rm -f .version .*.o.flags .*.o.d Makefile.media \ @@ -289,7 +298,9 @@ distclean:: clean -rm -f scripts/lxdialog scripts/kconfig oss @find .. -name '*.orig' -exec rm '{}' \; @find .. -name '*.rej' -exec rm '{}' \; - $(MAKE) -C firmware distclean + $(MAKE) -C firmware $@ + $(MAKE) -C ../v4l2-spec $@ + $(MAKE) -C ../v4l2-apps $@ ################################################# # Kernel module insert/removal rules diff --git a/v4l/scripts/strip-trailing-whitespaces.sh b/v4l/scripts/strip-trailing-whitespaces.sh index cb341ce76..def48a67d 100755 --- a/v4l/scripts/strip-trailing-whitespaces.sh +++ b/v4l/scripts/strip-trailing-whitespaces.sh @@ -21,7 +21,7 @@ fi for file in `eval $files`; do case "$file" in - *.patch) + *.gif | *.pdf | *.patch) continue ;; esac diff --git a/v4l/versions.txt b/v4l/versions.txt index b05ebdb0f..ac0266047 100644 --- a/v4l/versions.txt +++ b/v4l/versions.txt @@ -8,10 +8,6 @@ VIDEO_PXA27x [2.6.28] USB_STV06XX -[2.6.27] -# Needs struct pxa_dma_desc -VIDEO_PXA27x - [2.6.26] # Requires struct i2c_device_id VIDEO_TVP514X |