mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-13 16:16:15 -04:00
staging: bcm2835-camera: Add multiple inclusion protection to headers
mmal-common.h and mmal-msg.h didn't have the normal ifndef FOO / define FOO / endif protection to stop it being included multiple times. Add it. Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org> Signed-off-by: Stefan Wahren <wahrenst@gmx.net> Acked-by: Hans Verkuil <hverkuil-cisco@xs4all.nl> Acked-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
abb4718cc6
commit
807855cab7
2 changed files with 6 additions and 0 deletions
|
|
@ -13,6 +13,8 @@
|
|||
* MMAL structures
|
||||
*
|
||||
*/
|
||||
#ifndef MMAL_COMMON_H
|
||||
#define MMAL_COMMON_H
|
||||
|
||||
#define MMAL_FOURCC(a, b, c, d) ((a) | (b << 8) | (c << 16) | (d << 24))
|
||||
#define MMAL_MAGIC MMAL_FOURCC('m', 'm', 'a', 'l')
|
||||
|
|
@ -56,3 +58,4 @@ struct mmal_colourfx {
|
|||
u32 u;
|
||||
u32 v;
|
||||
};
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -23,6 +23,8 @@
|
|||
* implementation uses fixed size types and not the enums (though the
|
||||
* comments have the actual enum type
|
||||
*/
|
||||
#ifndef MMAL_MSG_H
|
||||
#define MMAL_MSG_H
|
||||
|
||||
#define VC_MMAL_VER 15
|
||||
#define VC_MMAL_MIN_VER 10
|
||||
|
|
@ -401,3 +403,4 @@ struct mmal_msg {
|
|||
u8 payload[MMAL_MSG_MAX_PAYLOAD];
|
||||
} u;
|
||||
};
|
||||
#endif
|
||||
|
|
|
|||
Loading…
Reference in a new issue