summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2015-07-28 10:24:37 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2015-07-28 10:24:37 -0700
commit02ff371afd92db14c9b5c9d09e2592dbb9ffae1a (patch)
tree463358c659bd26fb47764ce2a1d3556a6a87eb82 /include
parent90c8acceac05f1e1416367419be9108dbdbe11c9 (diff)
parent599ad5ac9a59587a46f6540a8e2ab79dff811f7d (diff)
downloadlinux-02ff371afd92db14c9b5c9d09e2592dbb9ffae1a.tar.bz2
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')
-rw-r--r--include/linux/of_device.h2
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;
}