From c2b31dd160679b4bdb7d10896804fc3110114c4b Mon Sep 17 00:00:00 2001
From: Michael Krufky <devnull@localhost>
Date: Sat, 8 Oct 2005 23:06:20 +0000
Subject:         * ../linux/include/linux/videodev.h:         - #include
 "compat.h"

        * ../v4l/Makefile:
        - add two new make commands for tree-merge:
          make merge
          make unmerge
	- this allows tree-merge commands to be called from
	  both top-level v4l-kernel and v4l-kernel/v4l

        * ../v4l/scripts/merge-trees.sh:
        * ../v4l/scripts/unmerge-trees.sh:
        - fix offsets

        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..fbd964295 100644
--- a/linux/include/linux/videodev.h
+++ b/linux/include/linux/videodev.h
@@ -3,6 +3,7 @@
 
 #include <linux/compiler.h>
 #include <linux/types.h>
+#include "compat.h"
 
 #define HAVE_V4L2 1
 #include <linux/videodev2.h>
-- 
cgit v1.2.3