git.openwrt.org Git - openwrt/staging/luka.git/blob

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