linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
* [PATCH soc/next] ARM: bcm2835: add mutual inclusion protection
@ 2015-10-22 18:46 Alexander Aring
  2015-10-26 18:27 ` Eric Anholt
  2015-10-27 17:00 ` Lee Jones
  0 siblings, 2 replies; 7+ messages in thread
From: Alexander Aring @ 2015-10-22 18:46 UTC (permalink / raw)
  To: linux-arm-kernel

This patch adds mutual inclusion protection for the rpi firmware header.

Cc: Eric Anholt <eric@anholt.net>
Cc: Stephen Warren <swarren@wwwdotorg.org>
Signed-off-by: Alexander Aring <alex.aring@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

^ permalink raw reply related	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2015-10-29  3:59 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-10-22 18:46 [PATCH soc/next] ARM: bcm2835: add mutual inclusion protection Alexander Aring
2015-10-26 18:27 ` Eric Anholt
2015-10-26 19:07   ` Florian Fainelli
2015-10-27 17:00 ` Lee Jones
2015-10-27 17:42   ` Alexander Aring
2015-10-28  9:45     ` Lee Jones
2015-10-29  3:59     ` Stephen Warren

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).