summaryrefslogtreecommitdiff
path: root/include/acpi
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2020-09-22 12:45:41 -0600
committerBin Meng <bmeng.cn@gmail.com>2020-09-25 11:27:25 +0800
commitee3cb7c648988aa5f7ae0872ecfb6bdcfa9c6c76 (patch)
treeb4fe0a310ab27a41c22d161834e5dc914aa0928e /include/acpi
parent70c202c480b8dadd27dbfb723f0cede1fb0e0d0c (diff)
x86: Move include of bitops out of ACPI region
At present linux/bitops.h is included in ACPI code. This is not needed and can cause a problem in fls64.h since BITS_PER_LONG is not defined. Move the #include into the part not used by ACPI. Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
Diffstat (limited to 'include/acpi')
-rw-r--r--include/acpi/acpi_table.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/acpi/acpi_table.h b/include/acpi/acpi_table.h
index 3a243bf19c..abbca6530d 100644
--- a/include/acpi/acpi_table.h
+++ b/include/acpi/acpi_table.h
@@ -14,7 +14,6 @@
#define __ACPI_TABLE_H__
#include <dm/acpi.h>
-#include <linux/bitops.h>
#define RSDP_SIG "RSD PTR " /* RSDP pointer signature */
#define OEM_ID "U-BOOT" /* U-Boot */
@@ -29,6 +28,8 @@
#if !defined(__ACPI__)
+#include <linux/bitops.h>
+
struct acpi_ctx;
/*