diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-03-16 20:25:17 +0000 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-03-16 20:25:17 +0000 |
| commit | a94c7b0a8f31a8bcf3b136d469f7eb6b6b57bb78 (patch) | |
| tree | cac33ce0abaaeb56b6e08a396cb7ff4e3e3b8f61 /include/linux/of.h | |
| parent | d4ef467aea0fdcd5e75a4bbfaf97e579bbe532f3 (diff) | |
| parent | 9652e8bd16e73f7a34cabf1ab114aaa5c97db660 (diff) | |
Merge branch 'spear/dt' into next/dt2
* spear/dt:
ARM: SPEAr600: Add device-tree support to SPEAr600 boards
(update to v3.3-rc7)
Conflicts:
arch/arm/mach-spear6xx/spear6xx.c
arch/arm/mach-vexpress/Kconfig
The conflicts are between the previous contents of the next/dt2
branch and upstream changes from v3.3-rc7.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'include/linux/of.h')
| -rw-r--r-- | include/linux/of.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/include/linux/of.h b/include/linux/of.h index 50059cf63135..612f84b007c6 100644 --- a/include/linux/of.h +++ b/include/linux/of.h @@ -281,6 +281,14 @@ static inline struct property *of_find_property(const struct device_node *np, return NULL; } +static inline struct device_node *of_find_compatible_node( + struct device_node *from, + const char *type, + const char *compat) +{ + return NULL; +} + static inline int of_property_read_u32_array(const struct device_node *np, const char *propname, u32 *out_values, size_t sz) |