blob: b6d7667c86bc2841ce1b023f9f121e19329915ad (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
|
From 1ae2f10aaf05db61db9e58fa035c13eea2d5f0b6 Mon Sep 17 00:00:00 2001
From: Dave Stevenson <dave.stevenson@raspberrypi.org>
Date: Thu, 10 May 2018 12:42:12 -0700
Subject: [PATCH 372/454] staging: bcm2835-camera: Add multiple include
protection
commit 514a6ab198c6b8bc78e681288a582972641e713a upstream.
mmal-parameters.h didn't have the normal
...
protection to stop it being included multiple times. Add it.
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>
---
.../staging/vc04_services/bcm2835-camera/mmal-parameters.h | 5 +++++
1 file changed, 5 insertions(+)
--- a/drivers/staging/vc04_services/bcm2835-camera/mmal-parameters.h
+++ b/drivers/staging/vc04_services/bcm2835-camera/mmal-parameters.h
@@ -21,6 +21,9 @@
* @{
*/
+#ifndef __MMAL_PARAMETERS_H
+#define __MMAL_PARAMETERS_H
+
/** Common parameter ID group, used with many types of component. */
#define MMAL_PARAMETER_GROUP_COMMON (0<<16)
/** Camera-specific parameter ID group. */
@@ -685,3 +688,5 @@ struct mmal_parameter_camera_info_t {
struct mmal_parameter_camera_info_flash_t
flashes[MMAL_PARAMETER_CAMERA_INFO_MAX_FLASHES];
};
+
+#endif
|