summaryrefslogtreecommitdiff
path: root/linux/include
diff options
context:
space:
mode:
Diffstat (limited to 'linux/include')
-rw-r--r--linux/include/media/saa7146.h4
-rw-r--r--linux/include/media/saa7146_vv.h6
2 files changed, 6 insertions, 4 deletions
diff --git a/linux/include/media/saa7146.h b/linux/include/media/saa7146.h
index dcb4510c5..ac8544da4 100644
--- a/linux/include/media/saa7146.h
+++ b/linux/include/media/saa7146.h
@@ -14,7 +14,9 @@
#include <asm/io.h> /* for accessing devices */
#include <linux/stringify.h>
-#include "compat.h"
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,51)
+ #include "compat.h"
+#endif
#define SAA7146_VERSION_CODE KERNEL_VERSION(0,5,0)
diff --git a/linux/include/media/saa7146_vv.h b/linux/include/media/saa7146_vv.h
index a22ebe560..f45c32a4c 100644
--- a/linux/include/media/saa7146_vv.h
+++ b/linux/include/media/saa7146_vv.h
@@ -1,10 +1,10 @@
#ifndef __SAA7146_VV__
#define __SAA7146_VV__
-#include "saa7146.h"
-
#include <linux/videodev2.h>
-#include "video-buf.h"
+
+#include <media/saa7146.h>
+#include <media/video-buf.h>
#define MAX_SAA7146_CAPTURE_BUFFERS 32 /* arbitrary */
#define BUFFER_TIMEOUT (HZ/2) /* 0.5 seconds */