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 --- linux/drivers/media/video/bttv.h | 3 ++- linux/include/linux/videodev.h | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'linux') diff --git a/linux/drivers/media/video/bttv.h b/linux/drivers/media/video/bttv.h index 981c02981..c26d1dfd9 100644 --- a/linux/drivers/media/video/bttv.h +++ b/linux/drivers/media/video/bttv.h @@ -1,5 +1,5 @@ /* - * $Id: bttv.h,v 1.22 2005/07/28 18:41:21 mchehab Exp $ + * $Id: bttv.h,v 1.23 2005/08/28 18:22:34 mkrufky Exp $ * * bttv - Bt848 frame grabber driver * @@ -17,6 +17,7 @@ #include #include +#include "compat.h" /* ---------------------------------------------------------- */ /* exported by bttv-cards.c */ diff --git a/linux/include/linux/videodev.h b/linux/include/linux/videodev.h index d2d8928ec..b93a78041 100644 --- a/linux/include/linux/videodev.h +++ b/linux/include/linux/videodev.h @@ -17,6 +17,7 @@ #if LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0) #include #endif +#include "compat.h" struct video_device { -- cgit v1.2.3