aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/of.h
diff options
context:
space:
mode:
authorGrant Likely <grant.likely@secretlab.ca>2013-02-13 09:59:13 +0000
committerGrant Likely <grant.likely@secretlab.ca>2013-02-13 09:59:13 +0000
commitbfc4a58986ba3934bb256ef3567aeeab262aa959 (patch)
treebd26e4a6a10e19b510cec9674448bdb18633630a /include/linux/of.h
parentof/exynos_g2d: Add Bindings for exynos G2D driver (diff)
parentdocumentation/devicetree: Fix a typo in exynos-dw-mshc.txt (diff)
downloadlinux-dev-bfc4a58986ba3934bb256ef3567aeeab262aa959.tar.xz
linux-dev-bfc4a58986ba3934bb256ef3567aeeab262aa959.zip
Merge branch 'for-next' from git://sources.calxeda.com/kernel/linux.git
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Diffstat (limited to 'include/linux/of.h')
-rw-r--r--include/linux/of.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/of.h b/include/linux/of.h
index 1e0d0c1bfb5e..b9e1b911f0eb 100644
--- a/include/linux/of.h
+++ b/include/linux/of.h
@@ -92,7 +92,7 @@ static inline void of_node_put(struct device_node *node) { }
extern struct device_node *of_allnodes;
extern struct device_node *of_chosen;
extern struct device_node *of_aliases;
-extern rwlock_t devtree_lock;
+extern raw_spinlock_t devtree_lock;
static inline bool of_have_populated_dt(void)
{