Merge pull request #1 from groeck/master

[groeck-nct6775] / compat.h

diff --git a/compat.h b/compat.h
index a697a6299678a21ae80f657394bbce51ca8b8566..b670e5ce78bc400af3f8331ed6883b6f3c1238f4 100644 (file)
--- a/compat.h
+++ b/compat.h
@@ -199,12 +199,14 @@ module_exit(__driver##_exit);
 #define clamp_val SENSORS_LIMIT
 #endif
 
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 12, 0)
 #ifndef kstrtol
 #define kstrtol strict_strtol
 #endif
 #ifndef kstrtoul
 #define kstrtoul strict_strtoul
 #endif
+#endif
 
 #ifndef request_muxed_region
 #define request_muxed_region(a, b, c) (true)
@@ -213,4 +215,12 @@ module_exit(__driver##_exit);
 #define release_region(a, b)
 #endif
 
+#ifndef pr_warn
+/* pr_warn macro not introduced until 2.6.35 */
+#define pr_warn pr_warning
+#endif
+#ifndef pr_warn_ratelimited
+#define pr_warn_ratelimited pr_warning_ratelimited
+#endif
+
 #endif /* __COMPAT_H */