From: airbjorn <gerhart@posteo.de>
Date: Tue, 15 Dec 2015 15:44:55 +0000 (+0100)
Subject: fix compile errors on RHEL7
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=refs%2Fpull%2F36%2Fhead;p=groeck-nct6775

fix compile errors on RHEL7
---

diff --git a/compat.h b/compat.h
index 72cea8c..691d730 100644
--- a/compat.h
+++ b/compat.h
@@ -20,6 +20,7 @@ u8 vid_which_vrm(void)
 #endif
 
 #if LINUX_VERSION_CODE < KERNEL_VERSION(3, 12, 0)
+#if !(defined RHEL_MAJOR && RHEL_MAJOR == 7)
 #if !(defined RHEL_MAJOR && RHEL_MAJOR == 6 && RHEL_MINOR >= 7)
 static int sysfs_create_groups(struct kobject *kobj,
 			       const struct attribute_group **groups)
@@ -52,7 +53,9 @@ static void sysfs_remove_groups(struct kobject *kobj,
 	for (i = 0; groups[i]; i++)
 		sysfs_remove_group(kobj, groups[i]);
 }
+#endif
 
+#if !(defined RHEL_MAJOR && RHEL_MAJOR == 7)
 #if !(defined RHEL_MAJOR && RHEL_MAJOR == 6 && RHEL_MINOR >= 7)
 static inline int __must_check PTR_ERR_OR_ZERO(__force const void *ptr)
 {
@@ -63,6 +66,7 @@ static inline int __must_check PTR_ERR_OR_ZERO(__force const void *ptr)
 }
 #endif
 #endif
+#endif
 
 #ifdef __NEED_I2C__