From 00e9f42e60719e2c015d16ca76f20e88cb5e1850 Mon Sep 17 00:00:00 2001
From: Michael Krufky <devnull@localhost>
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 <mkrufky@m1k.net>
---
 linux/include/linux/videodev.h | 1 +
 1 file changed, 1 insertion(+)

(limited to 'linux/include')

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 <linux/device.h>
 #endif
+#include "compat.h"
 
 struct video_device
 {
-- 
cgit v1.2.3