diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-18 11:47:53 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-18 11:47:53 -0700 |
| commit | bab58350e565756df9e45daafe8301a309b35e7e (patch) | |
| tree | 16dd66427112b89b2158ad3ca50a29043fb72fdf /include/linux/of_irq.h | |
| parent | ec351832bc83daf5985c4c3cbb72d743a2408a73 (diff) | |
| parent | 205a8eb7ce713c7f1722297dd97d19dcea6f266c (diff) | |
Merge tag 'dt-fixes-for-3.7' of git://sources.calxeda.com/kernel/linux
Pull DeviceTree fixes from Rob Herring:
"A handful of fixes:
- a fix for dtc from upstream
- sparse fixes in DeviceTree code
- stub of_get_child_by_name for !OF builds"
* tag 'dt-fixes-for-3.7' of git://sources.calxeda.com/kernel/linux:
dtc: fix for_each_*() to skip first object if deleted
of/platform: sparse fix
of/irq: sparse fixes
of/address: sparse fixes
of: add stub of_get_child_by_name for non-OF builds
Diffstat (limited to 'include/linux/of_irq.h')
| -rw-r--r-- | include/linux/of_irq.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/of_irq.h b/include/linux/of_irq.h index b8e24112520..535cecf1e02 100644 --- a/include/linux/of_irq.h +++ b/include/linux/of_irq.h @@ -58,8 +58,8 @@ static inline int of_irq_map_oldworld(struct device_node *device, int index, #endif /* CONFIG_PPC32 && CONFIG_PPC_PMAC */ -extern int of_irq_map_raw(struct device_node *parent, const u32 *intspec, - u32 ointsize, const u32 *addr, +extern int of_irq_map_raw(struct device_node *parent, const __be32 *intspec, + u32 ointsize, const __be32 *addr, struct of_irq *out_irq); extern int of_irq_map_one(struct device_node *device, int index, struct of_irq *out_irq); |