Drop ACPI mutex code

[groeck-it87] / compat.h

diff --git a/compat.h b/compat.h
index d51239777cd106336f812c1e3dabbd93d8f16525..865dcc520caec6b6b858363d8f621eb84231afcc 100644 (file)
--- a/compat.h
+++ b/compat.h
@@ -9,16 +9,60 @@
 #ifndef COMPAT_H
 #define COMPAT_H
 
-#ifndef kstrtol
-#define kstrtol strict_strtol
-#endif
-#ifndef kstrtoul
-#define kstrtoul strict_strtoul
+#include <linux/version.h>
+
+#ifndef clamp_val
+#define clamp_val SENSORS_LIMIT
 #endif
 
 #ifndef request_muxed_region
-#define request_muxed_region(a, b, c) (true)
-#define release_region(a, b)
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 28)
+#define request_muxed_region(start,n,name)     __request_region(&ioport_resource, (start), (n), (name))
+#else
+#define IORESOURCE_MUXED       0x00400000
+#define request_muxed_region(start,n,name)     __request_region(&ioport_resource, (start), (n), (name), IORESOURCE_MUXED)
+#endif
+#endif
+
+/* Red Hat EL5 includes backports of these functions, so we can't redefine
+ * our own. */
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 24)
+#if !(defined RHEL_MAJOR && RHEL_MAJOR == 5 && RHEL_MINOR >= 5)
+static inline int strict_strtoul(const char *cp, unsigned int base,
+                                 unsigned long *res)
+{
+       *res = simple_strtoul(cp, NULL, base);
+       return 0;
+}
+
+static inline int strict_strtol(const char *cp, unsigned int base, long *res)
+{
+       *res = simple_strtol(cp, NULL, base);
+       return 0;
+}
+#endif
+#endif
+
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 39)
+#define kstrtoul strict_strtoul 
+#define kstrtol strict_strtol
+#endif
+
+/*
+ * Some kernel configurations may have CONFIG_HWMON_VID disabled.
+ * We still have the functios declared as external, so we can not use
+ * static inline.
+ */
+#if !defined(CONFIG_HWMON_VID) && !defined(CONFIG_HWMON_VID_MODULE)
+int vid_from_reg(int val, u8 vrm)
+{
+       return 0;
+}
+
+u8 vid_which_vrm(void)
+{
+       return 0;
+}
 #endif
 
 #endif /* COMPAT_H */