summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-05-18 10:46:50 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2013-05-18 10:46:50 -0700
commitff9129b06cfb05cb5920f1151c75506afe1586fe (patch)
treebf527a9d8db078b37da863e5959cfb100622aadb /include
parent3c6a279ffccd0c414ecd1d5eb4670ed70072c526 (diff)
parent3132f623386e9ac87077bd839e726f7b940fbc94 (diff)
downloadlinux-ff9129b06cfb05cb5920f1151c75506afe1586fe.tar.bz2
Merge tag 'devicetree-for-linus' of git://git.secretlab.ca/git/linux
Pull device tree fixes from Grant Likely: "Device tree bug fixes and documentation updates for v3.10 Nothing earth shattering here. A build failure fix, and fix for releasing nodes and some documenation updates." * tag 'devicetree-for-linus' of git://git.secretlab.ca/git/linux: Documentation/devicetree: make semantic of initrd-end more explicit of/base: release the node correctly in of_parse_phandle_with_args() of/documentation: move video device bindings to a common place <linux/of_platform.h>: fix compilation warnings with DT disabled
Diffstat (limited to 'include')
-rw-r--r--include/linux/of_platform.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/include/linux/of_platform.h b/include/linux/of_platform.h
index 3863a4dbdf18..2a93b64a3869 100644
--- a/include/linux/of_platform.h
+++ b/include/linux/of_platform.h
@@ -11,9 +11,10 @@
*
*/
-#ifdef CONFIG_OF_DEVICE
#include <linux/device.h>
#include <linux/mod_devicetable.h>
+
+#ifdef CONFIG_OF_DEVICE
#include <linux/pm.h>
#include <linux/of_device.h>
#include <linux/platform_device.h>
@@ -100,7 +101,7 @@ extern int of_platform_populate(struct device_node *root,
#if !defined(CONFIG_OF_ADDRESS)
struct of_dev_auxdata;
-struct device;
+struct device_node;
static inline int of_platform_populate(struct device_node *root,
const struct of_device_id *matches,
const struct of_dev_auxdata *lookup,