1 From 0008dd56e2ba38f0fda813a923b457a77cfa7845 Mon Sep 17 00:00:00 2001
2 From: Dave Stevenson <dave.stevenson@raspberrypi.org>
3 Date: Mon, 24 Sep 2018 16:21:06 +0100
4 Subject: [PATCH 255/782] staging: bcm2835-camera: Add multiple inclusion
7 mmal-common.h and mmal-msg.h didn't have the normal
8 ifndef FOO / define FOO / endif protection to stop it being
9 included multiple times. Add it.
11 Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
13 drivers/staging/vc04_services/bcm2835-camera/mmal-common.h | 3 +++
14 drivers/staging/vc04_services/bcm2835-camera/mmal-msg.h | 3 +++
15 2 files changed, 6 insertions(+)
17 --- a/drivers/staging/vc04_services/bcm2835-camera/mmal-common.h
18 +++ b/drivers/staging/vc04_services/bcm2835-camera/mmal-common.h
23 +#ifndef MMAL_COMMON_H
24 +#define MMAL_COMMON_H
26 #define MMAL_FOURCC(a, b, c, d) ((a) | (b << 8) | (c << 16) | (d << 24))
27 #define MMAL_MAGIC MMAL_FOURCC('m', 'm', 'a', 'l')
28 @@ -56,3 +58,4 @@ struct mmal_colourfx {
33 --- a/drivers/staging/vc04_services/bcm2835-camera/mmal-msg.h
34 +++ b/drivers/staging/vc04_services/bcm2835-camera/mmal-msg.h
36 * implementation uses fixed size types and not the enums (though the
37 * comments have the actual enum type
42 #define VC_MMAL_VER 15
43 #define VC_MMAL_MIN_VER 10
44 @@ -401,3 +403,4 @@ struct mmal_msg {
45 u8 payload[MMAL_MSG_MAX_PAYLOAD];