diff options
Diffstat (limited to 'recipes-ti/dmai/ti-dmai/omap3530-r642-remove-include-videodev.diff')
-rw-r--r-- | recipes-ti/dmai/ti-dmai/omap3530-r642-remove-include-videodev.diff | 74 |
1 files changed, 45 insertions, 29 deletions
diff --git a/recipes-ti/dmai/ti-dmai/omap3530-r642-remove-include-videodev.diff b/recipes-ti/dmai/ti-dmai/omap3530-r642-remove-include-videodev.diff index 54963542..63f9cc68 100644 --- a/recipes-ti/dmai/ti-dmai/omap3530-r642-remove-include-videodev.diff +++ b/recipes-ti/dmai/ti-dmai/omap3530-r642-remove-include-videodev.diff | |||
@@ -1,19 +1,32 @@ | |||
1 | Index: dmai/packages/ti/sdo/dmai/linux/omap3530/priv/_VideoBuf.h | 1 | From 06c4cfeec98f4f1e31543878ceb74c5fff1907e4 Mon Sep 17 00:00:00 2001 |
2 | =================================================================== | 2 | From: Enrico Butera <ebutera@users.berlios.de> |
3 | --- dmai/packages/ti/sdo/dmai/linux/omap3530/priv/_VideoBuf.h (revisione 642) | 3 | Date: Thu, 22 Dec 2011 11:01:58 +0100 |
4 | +++ dmai/packages/ti/sdo/dmai/linux/omap3530/priv/_VideoBuf.h (copia locale) | 4 | Subject: [PATCH 1/2] adjust videdev headers for recent kernels |
5 | @@ -34,7 +34,6 @@ | 5 | |
6 | #ifndef ti_sdo_dai_linux_priv__VideoBuf_h_ | 6 | Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> |
7 | #define ti_sdo_dai_linux_priv__VideoBuf_h_ | 7 | --- |
8 | 8 | .../packages/ti/sdo/dmai/linux/omap3530/Capture.c | 1 - | |
9 | .../ti/sdo/dmai/linux/omap3530/Display_v4l2.c | 1 - | ||
10 | .../ti/sdo/dmai/linux/omap3530/_VideoBuf.c | 1 - | ||
11 | .../ti/sdo/dmai/linux/omap3530/priv/_VideoBuf.h | 1 - | ||
12 | 4 files changed, 0 insertions(+), 4 deletions(-) | ||
13 | |||
14 | diff --git a/davinci_multimedia_application_interface/dmai/packages/ti/sdo/dmai/linux/omap3530/Capture.c b/davinci_multimedia_application_interface/dmai/packages/ti/sdo/dmai/linux/omap3530/Capture.c | ||
15 | index a924169..c2b45d2 100644 | ||
16 | --- a/davinci_multimedia_application_interface/dmai/packages/ti/sdo/dmai/linux/omap3530/Capture.c | ||
17 | +++ b/davinci_multimedia_application_interface/dmai/packages/ti/sdo/dmai/linux/omap3530/Capture.c | ||
18 | @@ -40,7 +40,6 @@ | ||
19 | #include <sys/mman.h> | ||
20 | #include <sys/ioctl.h> | ||
21 | #include <asm/types.h> | ||
9 | -#include <linux/videodev.h> | 22 | -#include <linux/videodev.h> |
10 | #include <linux/videodev2.h> | 23 | #include <linux/videodev2.h> |
11 | 24 | ||
12 | #include <ti/sdo/dmai/BufferGfx.h> | 25 | #include <xdc/std.h> |
13 | Index: dmai/packages/ti/sdo/dmai/linux/omap3530/_VideoBuf.c | 26 | diff --git a/davinci_multimedia_application_interface/dmai/packages/ti/sdo/dmai/linux/omap3530/Display_v4l2.c b/davinci_multimedia_application_interface/dmai/packages/ti/sdo/dmai/linux/omap3530/Display_v4l2.c |
14 | =================================================================== | 27 | index 0d01b39..0c35efe 100644 |
15 | --- dmai/packages/ti/sdo/dmai/linux/omap3530/_VideoBuf.c (revisione 642) | 28 | --- a/davinci_multimedia_application_interface/dmai/packages/ti/sdo/dmai/linux/omap3530/Display_v4l2.c |
16 | +++ dmai/packages/ti/sdo/dmai/linux/omap3530/_VideoBuf.c (copia locale) | 29 | +++ b/davinci_multimedia_application_interface/dmai/packages/ti/sdo/dmai/linux/omap3530/Display_v4l2.c |
17 | @@ -38,7 +38,6 @@ | 30 | @@ -38,7 +38,6 @@ |
18 | #include <sys/ioctl.h> | 31 | #include <sys/ioctl.h> |
19 | #include <sys/mman.h> | 32 | #include <sys/mman.h> |
@@ -22,22 +35,10 @@ Index: dmai/packages/ti/sdo/dmai/linux/omap3530/_VideoBuf.c | |||
22 | #include <linux/videodev2.h> | 35 | #include <linux/videodev2.h> |
23 | 36 | ||
24 | #include <xdc/std.h> | 37 | #include <xdc/std.h> |
25 | Index: dmai/packages/ti/sdo/dmai/linux/omap3530/Capture.c | 38 | diff --git a/davinci_multimedia_application_interface/dmai/packages/ti/sdo/dmai/linux/omap3530/_VideoBuf.c b/davinci_multimedia_application_interface/dmai/packages/ti/sdo/dmai/linux/omap3530/_VideoBuf.c |
26 | =================================================================== | 39 | index 5615e2f..5cb712d 100644 |
27 | --- dmai/packages/ti/sdo/dmai/linux/omap3530/Capture.c (revisione 642) | 40 | --- a/davinci_multimedia_application_interface/dmai/packages/ti/sdo/dmai/linux/omap3530/_VideoBuf.c |
28 | +++ dmai/packages/ti/sdo/dmai/linux/omap3530/Capture.c (copia locale) | 41 | +++ b/davinci_multimedia_application_interface/dmai/packages/ti/sdo/dmai/linux/omap3530/_VideoBuf.c |
29 | @@ -40,7 +40,6 @@ | ||
30 | #include <sys/mman.h> | ||
31 | #include <sys/ioctl.h> | ||
32 | #include <asm/types.h> | ||
33 | -#include <linux/videodev.h> | ||
34 | #include <linux/videodev2.h> | ||
35 | |||
36 | #include <xdc/std.h> | ||
37 | Index: dmai/packages/ti/sdo/dmai/linux/omap3530/Display_v4l2.c | ||
38 | =================================================================== | ||
39 | --- dmai/packages/ti/sdo/dmai/linux/omap3530/Display_v4l2.c (revisione 642) | ||
40 | +++ dmai/packages/ti/sdo/dmai/linux/omap3530/Display_v4l2.c (copia locale) | ||
41 | @@ -38,7 +38,6 @@ | 42 | @@ -38,7 +38,6 @@ |
42 | #include <sys/ioctl.h> | 43 | #include <sys/ioctl.h> |
43 | #include <sys/mman.h> | 44 | #include <sys/mman.h> |
@@ -46,3 +47,18 @@ Index: dmai/packages/ti/sdo/dmai/linux/omap3530/Display_v4l2.c | |||
46 | #include <linux/videodev2.h> | 47 | #include <linux/videodev2.h> |
47 | 48 | ||
48 | #include <xdc/std.h> | 49 | #include <xdc/std.h> |
50 | diff --git a/davinci_multimedia_application_interface/dmai/packages/ti/sdo/dmai/linux/omap3530/priv/_VideoBuf.h b/davinci_multimedia_application_interface/dmai/packages/ti/sdo/dmai/linux/omap3530/priv/_VideoBuf.h | ||
51 | index b2128a3..dbaa4eb 100644 | ||
52 | --- a/davinci_multimedia_application_interface/dmai/packages/ti/sdo/dmai/linux/omap3530/priv/_VideoBuf.h | ||
53 | +++ b/davinci_multimedia_application_interface/dmai/packages/ti/sdo/dmai/linux/omap3530/priv/_VideoBuf.h | ||
54 | @@ -34,7 +34,6 @@ | ||
55 | #ifndef ti_sdo_dai_linux_priv__VideoBuf_h_ | ||
56 | #define ti_sdo_dai_linux_priv__VideoBuf_h_ | ||
57 | |||
58 | -#include <linux/videodev.h> | ||
59 | #include <linux/videodev2.h> | ||
60 | |||
61 | #include <ti/sdo/dmai/BufferGfx.h> | ||
62 | -- | ||
63 | 1.7.2.5 | ||
64 | |||