diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2015-07-03 08:38:17 +0200 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2015-07-03 08:38:17 +0200 |
commit | 18ea2863bf76d6cd81c83706b5eb180dc5ad23bc (patch) | |
tree | ae51ca9e03b538a58c576e1fa79983ec31e22269 /include/of.h | |
parent | c408a4ecbee60a9d512930972c09c6f9e365a671 (diff) | |
parent | 893f30f614da5ed132265f5c4da767ec26a8edf5 (diff) | |
download | barebox-18ea2863bf76d6cd81c83706b5eb180dc5ad23bc.tar.gz barebox-18ea2863bf76d6cd81c83706b5eb180dc5ad23bc.tar.xz |
Merge branch 'for-next/omap'
Conflicts:
arch/arm/boards/beagle/board.c
Diffstat (limited to 'include/of.h')
-rw-r--r-- | include/of.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/of.h b/include/of.h index c02f5f49ab..1db210b38a 100644 --- a/include/of.h +++ b/include/of.h @@ -224,6 +224,8 @@ extern int of_modalias_node(struct device_node *node, char *modalias, int len); extern struct device_node *of_get_root_node(void); extern int of_set_root_node(struct device_node *node); +extern struct device_d *of_platform_device_create(struct device_node *np, + struct device_d *parent); extern int of_platform_populate(struct device_node *root, const struct of_device_id *matches, struct device_d *parent); |