diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-08-13 00:59:09 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-08-13 00:59:09 -0400 |
commit | 73e0881d31406acc09eb11fa073108b43c89124e (patch) | |
tree | 8195f49c5f1b7e06caf3df36b4a1882902a83277 /include/linux | |
parent | e211bc8d96d45799cab1be46f4367327d5f629ba (diff) | |
parent | 89272b8c0d427021bed70b1b83e1a16be375ccf5 (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
Diffstat (limited to 'include/linux')
-rw-r--r-- | include/linux/of.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/include/linux/of.h b/include/linux/of.h index 0085bb01c041..9180dc5cb00b 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, | |||
256 | return -ENOSYS; | 256 | return -ENOSYS; |
257 | } | 257 | } |
258 | 258 | ||
259 | static inline const void *of_get_property(const struct device_node *node, | ||
260 | const char *name, | ||
261 | int *lenp) | ||
262 | { | ||
263 | return NULL; | ||
264 | } | ||
265 | |||
259 | #endif /* CONFIG_OF */ | 266 | #endif /* CONFIG_OF */ |
260 | 267 | ||
261 | static inline int of_property_read_u32(const struct device_node *np, | 268 | static inline int of_property_read_u32(const struct device_node *np, |