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-15 22:12:50 +0100 |
| commit | d976e4ad15dea86a082d50ca6ca17d8c6def00a4 (patch) | |
| tree | 12760433832860d19e29280ba4a5179c066b6f07 | |
| parent | 2f7a425c53ace8f7f2fabb7ca95bc09c77670d6d (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.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 ff55d76e..22f7a72c 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,5 +53,5 @@ 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 */ #endif /* __BACKPORT_LINUX_ACPI_H */ |