diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-05-19 15:03:24 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-05-19 15:03:24 -0700 |
| commit | 1fbbed4137de93e02fc62776b8bf08a2d9ae1141 (patch) | |
| tree | 1a50291637d723e1a49eed91d5d15d22452750c4 /include | |
| parent | f538a82c075ba3d31e7691a361f28795eff0a786 (diff) | |
| parent | 49e67dd17649b60b4d54966e18ec9c80198227f0 (diff) | |
Merge tag 'devicetree-fixes-for-4.12' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux
Pull DeviceTree fixes from Rob Herring:
- fix missing allocation failure handling in fdt code
- fix dtc compile error on 32-bit hosts
- revert bad sparse changes causing GCC7 warnings
* tag 'devicetree-fixes-for-4.12' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux:
of: fdt: add missing allocation-failure check
dtc: check.c fix compile error
Partially Revert "of: fix sparse warnings in fdt, irq, reserved mem, and resolver code"
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/of_irq.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/of_irq.h b/include/linux/of_irq.h index ec6b11deb773..1e0deb8e8494 100644 --- a/include/linux/of_irq.h +++ b/include/linux/of_irq.h @@ -8,7 +8,7 @@ #include <linux/ioport.h> #include <linux/of.h> -typedef int const (*of_irq_init_cb_t)(struct device_node *, struct device_node *); +typedef int (*of_irq_init_cb_t)(struct device_node *, struct device_node *); /* * Workarounds only applied to 32bit powermac machines |