summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2015-11-07 13:56:36 +0100
committerHauke Mehrtens <hauke@hauke-m.de>2015-11-15 19:23:21 +0100
commit10cb7d07edf63f9f405dbb68e61f7c65988c2d9c (patch)
treeeca7680a6862cdd5de30028367be360bf17077ef
parentfa47b1d182d8c16f3a71f78064bd246c8336154b (diff)
header: change check for ACPI_COMPANION
Upstream commit: 129646a4e199c6442e3da366baf155fccf36aa62 Instead of using the kernel version to check if we have to add a backport for ACPI_COMPANION check for it directly. RedHat 7 backported this change to their kernel and writes a warning without this change. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
-rw-r--r--backport/backport-include/linux/acpi.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/backport/backport-include/linux/acpi.h b/backport/backport-include/linux/acpi.h
index 395ca189..4c63a261 100644
--- a/backport/backport-include/linux/acpi.h
+++ b/backport/backport-include/linux/acpi.h
@@ -36,7 +36,7 @@
#endif /* CONFIG_ACPI */
#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,8,0) */
-#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 13, 0)
+#ifndef ACPI_COMPANION
#ifdef CONFIG_ACPI
static inline struct acpi_device *_acpi_get_companion(struct device *dev)
{
@@ -53,7 +53,7 @@ static inline struct acpi_device *_acpi_get_companion(struct device *dev)
#else
#define ACPI_COMPANION(dev) (NULL)
#endif /* CONFIG_ACPI */
-#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3, 13, 0) */
+#endif /* ACPI_COMPANION */
#if LINUX_VERSION_CODE < KERNEL_VERSION(3,19,0)
#define acpi_dev_remove_driver_gpios LINUX_BACKPORT(acpi_dev_remove_driver_gpios)