diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2015-07-28 10:24:37 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-07-28 10:24:37 -0700 |
| commit | 02ff371afd92db14c9b5c9d09e2592dbb9ffae1a (patch) | |
| tree | 463358c659bd26fb47764ce2a1d3556a6a87eb82 /include/linux | |
| parent | Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost (diff) | |
| parent | of: Drop owner assignment from platform and i2c driver (diff) | |
| download | linux-dev-02ff371afd92db14c9b5c9d09e2592dbb9ffae1a.tar.xz linux-dev-02ff371afd92db14c9b5c9d09e2592dbb9ffae1a.zip | |
Merge tag 'devicetree-fixes-for-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux
Pull devicetree fixes from Rob Herring:
"A handful of DT related fixes for 4.2-rc"
* tag 'devicetree-fixes-for-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux:
of: Drop owner assignment from platform and i2c driver
DEVICETREE: Misc fix for the AR7100 SPI controller binding
of: constify drv arg of of_driver_match_device stub
of: add HAS_IOMEM depends to OF_ADDRESS
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/of_device.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/of_device.h b/include/linux/of_device.h index 4c508549833a..cc7dd687a89d 100644 --- a/include/linux/of_device.h +++ b/include/linux/of_device.h @@ -59,7 +59,7 @@ void of_dma_configure(struct device *dev, struct device_node *np); #else /* CONFIG_OF */ static inline int of_driver_match_device(struct device *dev, - struct device_driver *drv) + const struct device_driver *drv) { return 0; } |