aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm2708/patches-4.14/950-0373-staging-bcm2835-camera-Move-struct-vchiq_mmal_rect.patch
diff options
context:
space:
mode:
Diffstat (limited to 'target/linux/brcm2708/patches-4.14/950-0373-staging-bcm2835-camera-Move-struct-vchiq_mmal_rect.patch')
-rw-r--r--target/linux/brcm2708/patches-4.14/950-0373-staging-bcm2835-camera-Move-struct-vchiq_mmal_rect.patch54
1 files changed, 0 insertions, 54 deletions
diff --git a/target/linux/brcm2708/patches-4.14/950-0373-staging-bcm2835-camera-Move-struct-vchiq_mmal_rect.patch b/target/linux/brcm2708/patches-4.14/950-0373-staging-bcm2835-camera-Move-struct-vchiq_mmal_rect.patch
deleted file mode 100644
index d5b8593af7..0000000000
--- a/target/linux/brcm2708/patches-4.14/950-0373-staging-bcm2835-camera-Move-struct-vchiq_mmal_rect.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 7df25059f84e7dab7fc8d733b83f016b62a33372 Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.org>
-Date: Thu, 10 May 2018 12:42:13 -0700
-Subject: [PATCH 373/454] staging: bcm2835-camera: Move struct vchiq_mmal_rect
-
-commit 84adcb14133ed2412d54355539a8ab4d6a3fcabc upstream.
-
-struct vchiq_mmal_rect is only referenced from mmal-parameters.h, yet
-was defined in mmal-vchiq.h.
-
-Move it to avoid having to include multiple headers for no reason.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
-Signed-off-by: Eric Anholt <eric@anholt.net>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- .../vc04_services/bcm2835-camera/mmal-parameters.h | 8 ++++++++
- drivers/staging/vc04_services/bcm2835-camera/mmal-vchiq.h | 8 --------
- 2 files changed, 8 insertions(+), 8 deletions(-)
-
---- a/drivers/staging/vc04_services/bcm2835-camera/mmal-parameters.h
-+++ b/drivers/staging/vc04_services/bcm2835-camera/mmal-parameters.h
-@@ -567,6 +567,14 @@ enum mmal_parameter_displayset {
- MMAL_DISPLAY_SET_ALPHA = 0x400,
- };
-
-+/* rectangle, used lots so it gets its own struct */
-+struct vchiq_mmal_rect {
-+ s32 x;
-+ s32 y;
-+ s32 width;
-+ s32 height;
-+};
-+
- struct mmal_parameter_displayregion {
- /** Bitfield that indicates which fields are set and should be
- * used. All other fields will maintain their current value.
---- a/drivers/staging/vc04_services/bcm2835-camera/mmal-vchiq.h
-+++ b/drivers/staging/vc04_services/bcm2835-camera/mmal-vchiq.h
-@@ -35,14 +35,6 @@ enum vchiq_mmal_es_type {
- MMAL_ES_TYPE_SUBPICTURE /**< Sub-picture elementary stream */
- };
-
--/* rectangle, used lots so it gets its own struct */
--struct vchiq_mmal_rect {
-- s32 x;
-- s32 y;
-- s32 width;
-- s32 height;
--};
--
- struct vchiq_mmal_port_buffer {
- unsigned int num; /* number of buffers */
- u32 size; /* size of buffers */