summaryrefslogtreecommitdiff
path: root/include/linux/fwnode.h
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2018-03-14 20:37:31 +0100
committerThomas Gleixner <tglx@linutronix.de>2018-03-14 20:37:31 +0100
commitb0d8bef8ed805ca92eb91e86acf3ce89cbebc8ce (patch)
tree8838391a76f0cf75ffcd31166996d03d19c580a6 /include/linux/fwnode.h
parent82b691bedf05f258f1c86c96ee574b0d7795c0a1 (diff)
parentfc6eabbbf8ef99efed778dd5afabc83c21dba585 (diff)
Merge branch 'linus' into irq/core to pick up dependencies.
Diffstat (limited to 'include/linux/fwnode.h')
-rw-r--r--include/linux/fwnode.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/fwnode.h b/include/linux/fwnode.h
index 4fa1a489efe4..4fe8f289b3f6 100644
--- a/include/linux/fwnode.h
+++ b/include/linux/fwnode.h
@@ -73,8 +73,8 @@ struct fwnode_operations {
struct fwnode_handle *(*get)(struct fwnode_handle *fwnode);
void (*put)(struct fwnode_handle *fwnode);
bool (*device_is_available)(const struct fwnode_handle *fwnode);
- void *(*device_get_match_data)(const struct fwnode_handle *fwnode,
- const struct device *dev);
+ const void *(*device_get_match_data)(const struct fwnode_handle *fwnode,
+ const struct device *dev);
bool (*property_present)(const struct fwnode_handle *fwnode,
const char *propname);
int (*property_read_int_array)(const struct fwnode_handle *fwnode,