aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-08-12 21:59:09 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2011-08-12 21:59:09 -0700
commit73e0881d31406acc09eb11fa073108b43c89124e (patch)
tree8195f49c5f1b7e06caf3df36b4a1882902a83277
parente211bc8d96d45799cab1be46f4367327d5f629ba (diff)
parent89272b8c0d427021bed70b1b83e1a16be375ccf5 (diff)
Merge branch 'devicetree/merge' of git://git.secretlab.ca/git/linux-2.6
* 'devicetree/merge' of git://git.secretlab.ca/git/linux-2.6: dt: add empty of_get_property for non-dt
-rw-r--r--include/linux/of.h7
1 files changed, 7 insertions, 0 deletions
diff --git a/include/linux/of.h b/include/linux/of.h
index 0085bb01c04..9180dc5cb00 100644
--- a/include/linux/of.h
+++ b/include/linux/of.h
@@ -256,6 +256,13 @@ static inline int of_property_read_string(struct device_node *np,
return -ENOSYS;
}
+static inline const void *of_get_property(const struct device_node *node,
+ const char *name,
+ int *lenp)
+{
+ return NULL;
+}
+
#endif /* CONFIG_OF */
static inline int of_property_read_u32(const struct device_node *np,