Merge branch 'master' into for-next

[firefly-linux-kernel-4.4.55.git] / include / linux / device.h

diff --git a/include/linux/device.h b/include/linux/device.h
index 516fecacf27b424f29b95c9ee4921b7fd5805dc5..dd489531346864be7031cd9d7937e29b44db3e00 100644 (file)
--- a/include/linux/device.h
+++ b/include/linux/device.h
@@ -751,4 +751,11 @@ do {                                                    \
        MODULE_ALIAS("char-major-" __stringify(major) "-" __stringify(minor))
 #define MODULE_ALIAS_CHARDEV_MAJOR(major) \
        MODULE_ALIAS("char-major-" __stringify(major) "-*")
+
+#ifdef CONFIG_SYSFS_DEPRECATED
+extern long sysfs_deprecated;
+#else
+#define sysfs_deprecated 0
+#endif
+
 #endif /* _DEVICE_H_ */