summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2014-02-03 09:52:34 +0100
committerSascha Hauer <s.hauer@pengutronix.de>2014-02-03 09:52:34 +0100
commitf4cece7db55f09069d729d4c915989980694d5c7 (patch)
tree87a80dff7de4f9ad0fc3a1ee8023a5bd2cdecb94 /include
parentca10989374ffb6f08fde864a95c623fc7557b8e8 (diff)
parent32d6d2ae769b5d3fa8815d28b442711dc4585cbe (diff)
downloadbarebox-f4cece7db55f09069d729d4c915989980694d5c7.tar.gz
barebox-f4cece7db55f09069d729d4c915989980694d5c7.tar.xz
Merge branch 'for-next/clps711x'
Diffstat (limited to 'include')
-rw-r--r--include/mfd/syscon.h8
1 files changed, 8 insertions, 0 deletions
diff --git a/include/mfd/syscon.h b/include/mfd/syscon.h
index 68432b7fe4..0eccd5cb5d 100644
--- a/include/mfd/syscon.h
+++ b/include/mfd/syscon.h
@@ -16,11 +16,19 @@
#ifdef CONFIG_MFD_SYSCON
void __iomem *syscon_base_lookup_by_pdevname(const char *);
+void __iomem *syscon_base_lookup_by_phandle
+ (struct device_node *np, const char *property);
#else
static inline void __iomem *syscon_base_lookup_by_pdevname(const char *)
{
return NULL;
}
+
+static inline void __iomem *syscon_base_lookup_by_phandle
+ (struct device_node *np, const char *property)
+{
+ return NULL;
+}
#endif
#endif