You cannot select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
40 lines
1.2 KiB
Diff
40 lines
1.2 KiB
Diff
6 years ago
|
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
|