X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=target%2Flinux%2Fbrcm2708%2Fpatches-4.19%2F950-0224-staging-bcm2835-camera-Add-multiple-inclusion-protec.patch;fp=target%2Flinux%2Fbrcm2708%2Fpatches-4.19%2F950-0224-staging-bcm2835-camera-Add-multiple-inclusion-protec.patch;h=0000000000000000000000000000000000000000;hb=7d7aa2fd924c27829ec25f825481554dd81bce97;hp=0feb27356600fa0aec79fd113c94d5b2e23b8619;hpb=e7bfda2c243e66a75ff966ba04c28b1590b5d24c;p=openwrt%2Fopenwrt.git

diff --git a/target/linux/brcm2708/patches-4.19/950-0224-staging-bcm2835-camera-Add-multiple-inclusion-protec.patch b/target/linux/brcm2708/patches-4.19/950-0224-staging-bcm2835-camera-Add-multiple-inclusion-protec.patch
deleted file mode 100644
index 0feb273566..0000000000
--- a/target/linux/brcm2708/patches-4.19/950-0224-staging-bcm2835-camera-Add-multiple-inclusion-protec.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From c37e8c9137e4858ed86e211f3fddbb9d9af08532 Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.org>
-Date: Mon, 24 Sep 2018 16:21:06 +0100
-Subject: [PATCH] staging: bcm2835-camera: Add multiple inclusion
- protection to headers
-
-mmal-common.h and mmal-msg.h didn't have the normal
-ifndef FOO / define FOO / endif protection to stop it being
-included multiple times. Add it.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
----
- drivers/staging/vc04_services/bcm2835-camera/mmal-common.h | 3 +++
- drivers/staging/vc04_services/bcm2835-camera/mmal-msg.h    | 3 +++
- 2 files changed, 6 insertions(+)
-
---- a/drivers/staging/vc04_services/bcm2835-camera/mmal-common.h
-+++ b/drivers/staging/vc04_services/bcm2835-camera/mmal-common.h
-@@ -13,6 +13,8 @@
-  * MMAL structures
-  *
-  */
-+#ifndef MMAL_COMMON_H
-+#define MMAL_COMMON_H
- 
- #define MMAL_FOURCC(a, b, c, d) ((a) | (b << 8) | (c << 16) | (d << 24))
- #define MMAL_MAGIC MMAL_FOURCC('m', 'm', 'a', 'l')
-@@ -56,3 +58,4 @@ struct mmal_colourfx {
- 	u32 u;
- 	u32 v;
- };
-+#endif
---- a/drivers/staging/vc04_services/bcm2835-camera/mmal-msg.h
-+++ b/drivers/staging/vc04_services/bcm2835-camera/mmal-msg.h
-@@ -23,6 +23,8 @@
-  * implementation uses fixed size types and not the enums (though the
-  * comments have the actual enum type
-  */
-+#ifndef MMAL_MSG_H
-+#define MMAL_MSG_H
- 
- #define VC_MMAL_VER 15
- #define VC_MMAL_MIN_VER 10
-@@ -401,3 +403,4 @@ struct mmal_msg {
- 		u8 payload[MMAL_MSG_MAX_PAYLOAD];
- 	} u;
- };
-+#endif