From 00e9f42e60719e2c015d16ca76f20e88cb5e1850 Mon Sep 17 00:00:00 2001 From: Michael Krufky Date: Sun, 28 Aug 2005 18:22:34 +0000 Subject: * scripts/merge-trees.sh, scripts/unmerge-trees.sh: - include files into tree-merge necessary for the dvb-bt8xx and dst dvb modules, based on bt8xx chips. This also includes all dvb frontends used by bt8xx boards. * bttv.h, videodev.h: - #include "compat.h", needed for tree-merge. Signed-off-by: Michael Krufky --- v4l/ChangeLog | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'v4l/ChangeLog') diff --git a/v4l/ChangeLog b/v4l/ChangeLog index d96feb2b4..8a7b227ee 100644 --- a/v4l/ChangeLog +++ b/v4l/ChangeLog @@ -1,3 +1,15 @@ +2005-08-28 18:15 mkrufky + + * scripts/merge-trees.sh, scripts/unmerge-trees.sh: + - include files into tree-merge necessary for the + dvb-bt8xx and dst dvb modules, based on bt8xx chips. + This also includes all dvb frontends used by bt8xx boards. + + * bttv.h, videodev.h: + - #include "compat.h", needed for tree-merge. + + Signed-off-by: Michael Krufky + 2005-08-25 05:59 mkrufky * cx88-dvb.c: (dvb_register): -- cgit v1.2.3