diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2013-02-13 04:59:13 -0500 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2013-02-13 04:59:13 -0500 |
| commit | bfc4a58986ba3934bb256ef3567aeeab262aa959 (patch) | |
| tree | bd26e4a6a10e19b510cec9674448bdb18633630a /include | |
| parent | 09495dda6a62c74b13412a63528093910ef80edd (diff) | |
| parent | 1421954bf9b967d819db23c911f950a2ccd60eff (diff) | |
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')
| -rw-r--r-- | include/linux/of.h | 2 |
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) { } | |||
| 92 | extern struct device_node *of_allnodes; | 92 | extern struct device_node *of_allnodes; |
| 93 | extern struct device_node *of_chosen; | 93 | extern struct device_node *of_chosen; |
| 94 | extern struct device_node *of_aliases; | 94 | extern struct device_node *of_aliases; |
| 95 | extern rwlock_t devtree_lock; | 95 | extern raw_spinlock_t devtree_lock; |
| 96 | 96 | ||
| 97 | static inline bool of_have_populated_dt(void) | 97 | static inline bool of_have_populated_dt(void) |
| 98 | { | 98 | { |