[PATCH soc/next] ARM: bcm2835: add mutual inclusion protection
Alexander Aring
alex.aring at gmail.com
Thu Oct 22 11:46:05 PDT 2015
This patch adds mutual inclusion protection for the rpi firmware header.
Cc: Eric Anholt <eric at anholt.net>
Cc: Stephen Warren <swarren at wwwdotorg.org>
Signed-off-by: Alexander Aring <alex.aring at gmail.com>
---
This patch is for "soc/next" and depends on Eric Anholt's patch ("ARM: bcm2835:
Add the Raspberry Pi firmware driver"), see:
http://lists.infradead.org/pipermail/linux-rpi-kernel/2015-October/002434.html
I think the patch is already applied but not pushed, so please fixup use this
as fixup or simple apply this patch after the patch to add the firmware driver.
include/soc/bcm2835/raspberrypi-firmware.h | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/include/soc/bcm2835/raspberrypi-firmware.h b/include/soc/bcm2835/raspberrypi-firmware.h
index 9d9efb7..c07d74a 100644
--- a/include/soc/bcm2835/raspberrypi-firmware.h
+++ b/include/soc/bcm2835/raspberrypi-firmware.h
@@ -6,6 +6,9 @@
* published by the Free Software Foundation.
*/
+#ifndef __SOC_RASPBERRY_FIRMWARE_H__
+#define __SOC_RASPBERRY_FIRMWARE_H__
+
#include <linux/types.h>
#include <linux/of_device.h>
@@ -113,3 +116,5 @@ int rpi_firmware_property(struct rpi_firmware *fw,
int rpi_firmware_property_list(struct rpi_firmware *fw,
void *data, size_t tag_size);
struct rpi_firmware *rpi_firmware_get(struct device_node *firmware_node);
+
+#endif /* __SOC_RASPBERRY_FIRMWARE_H__ */
--
2.6.1
More information about the linux-arm-kernel
mailing list