Merge branch 'linus' into perf/core

Refresh the branch to a v3.14-rc base before queueing up new devel patches.

Signed-off-by: Ingo Molnar <mingo@kernel.org>

1 files changed, 6 insertions, 0 deletions

diff --git a/include/linux/of_device.h b/include/linux/of_device.h
index 82ce324fdce7..8d7dd6768cb7 100644
--- a/include/linux/of_device.h
+++ b/include/linux/of_device.h
@@ -64,6 +64,12 @@ static inline int of_driver_match_device(struct device *dev,
 static inline void of_device_uevent(struct device *dev,
                         struct kobj_uevent_env *env) { }
 
+static inline int of_device_get_modalias(struct device *dev,
+                                   char *str, ssize_t len)
+{
+        return -ENODEV;
+}
+
 static inline int of_device_uevent_modalias(struct device *dev,
                                    struct kobj_uevent_env *env)
 {