summaryrefslogtreecommitdiff
path: root/v4l/ChangeLog
diff options
context:
space:
mode:
Diffstat (limited to 'v4l/ChangeLog')
-rw-r--r--v4l/ChangeLog10
1 files changed, 8 insertions, 2 deletions
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 <mkrufky@m1k.net>
+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 <mkrufky@m1k.net>