git.openwrt.org Git - openwrt/staging/blocktrron.git/blob

   1 From: Felix Fietkau <nbd@nbd.name>
   2 Date: Tue, 14 Jan 2025 11:42:25 +0100
   3 Subject: [PATCH] backport-include: fix linux/acpi_amd_wbrf.h inclusion
   4
   5 Fix building for kernel >= 6.8 by adjusting incorrect guard usage,
   6 otherwise an #include_next header is masked and compilation will fail
   7 for net/mac80211/wbrf.c in the mac80211 kernel module.
   8
   9 Fixes: 52cdcaab ("backport-include: backport linux/acpi_amd_wbrf.h")
  10 Reported-by: Tony Ambardar <itugrok@yahoo.com>
  11 Signed-off-by: Felix Fietkau <nbd@nbd.name>
  12 ---
  13
  14 --- a/backport-include/linux/acpi_amd_wbrf.h
  15 +++ b/backport-include/linux/acpi_amd_wbrf.h
  16 @@ -4,8 +4,8 @@
  17   * Copyright (C) 2023 Advanced Micro Devices
  18   */
  19
  20 -#ifndef _ACPI_AMD_WBRF_H
  21 -#define _ACPI_AMD_WBRF_H
  22 +#ifndef __BACKPORT_ACPI_AMD_WBRF_H
  23 +#define __BACKPORT_ACPI_AMD_WBRF_H
  24
  25  #if LINUX_VERSION_IS_GEQ(6,8,0)
  26  #include_next <linux/acpi_amd_wbrf.h>
  27 @@ -83,4 +83,4 @@ int amd_wbrf_unregister_notifier(struct
  28  }
  29
  30  #endif /* >=6,8,0 */
  31 -#endif /* _ACPI_AMD_WBRF_H */
  32 +#endif /* __BACKPORT_ACPI_AMD_WBRF_H */