From 96027e5e951d23ca39a6ed15b882f77a477cb80d Mon Sep 17 00:00:00 2001 From: Michael Krufky Date: Fri, 29 Jul 2005 05:17:44 +0000 Subject: - Include logic to detect merged dvb/v4l cvs trees using tree merging scripts, adding DVB_CVS to EXTRA_CFLAGS. Signed-off-by: Michael Krufky --- v4l/ChangeLog | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'v4l/ChangeLog') diff --git a/v4l/ChangeLog b/v4l/ChangeLog index 5140dfe9a..209fcd447 100644 --- a/v4l/ChangeLog +++ b/v4l/ChangeLog @@ -1,5 +1,11 @@ -2005-07-28 18:29 mchehab +2005-07-29 05:10 mkrufky + * Makefile, scripts/merge-trees.sh, scripts/unmerge-trees.sh: + - Include logic to detect merged dvb/v4l cvs trees using + tree merging scripts, adding DVB_CVS to EXTRA_CFLAGS. + + Signed-off-by: Michael Krufky +2005-07-28 18:29 mchehab * bttv-cards.c, bttv.h, doc/CARDLIST.bttv: - tuner_addr added. - Added support for Acorp Y878F card. @@ -55,7 +61,7 @@ * Makefile: - Include logic to detect compilation against -mm kernels, adding MM_KERNEL to EXTRA_CFLAGS. This test will be available - in -mm kernels AFTER (but not including) 2.6.13-rc3-mm1. + in -mm kernels 2.6.13-rc3-mm2 and later. Signed-off-by: Michael Krufky -- cgit v1.2.3