Merge branch 'topic/soundcore-preclaim' into for-linus

[pandora-kernel.git] / include / linux / of_device.h

diff --git a/include/linux/of_device.h b/include/linux/of_device.h
index 6dc1195..d3a74e0 100644 (file)
--- a/include/linux/of_device.h
+++ b/include/linux/of_device.h
@@ -1,6 +1,5 @@
 #ifndef _LINUX_OF_DEVICE_H
 #define _LINUX_OF_DEVICE_H
-#ifdef __KERNEL__
 
 #include <linux/device.h>
 #include <linux/of.h>
@@ -25,5 +24,7 @@ static inline void of_device_free(struct of_device *dev)
        of_release_dev(&dev->dev);
 }
 
-#endif /* __KERNEL__ */
+extern ssize_t of_device_get_modalias(struct of_device *ofdev,
+                                       char *str, ssize_t len);
+
 #endif /* _LINUX_OF_DEVICE_H */