diff options
author | Hauke Mehrtens <hauke@hauke-m.de> | 2015-11-07 13:56:36 +0100 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2015-11-07 17:12:09 +0100 |
commit | 129646a4e199c6442e3da366baf155fccf36aa62 (patch) | |
tree | 6235dd7ad6bd79e8513dc5c450634b02481c37ab /backport | |
parent | de3e523ad6dc0704360aab31c4aa477ad0920c73 (diff) |
header: change check for ACPI_COMPANION
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>
Diffstat (limited to 'backport')
-rw-r--r-- | backport/backport-include/linux/acpi.h | 4 |
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) |