diff options
| author | Simon Glass <sjg@chromium.org> | 2020-04-09 01:57:35 +0300 |
|---|---|---|
| committer | Bin Meng <bmeng.cn@gmail.com> | 2020-04-16 09:36:28 +0300 |
| commit | 3cabcf966d42649cd60eb575c9cf5c22eb9e9123 (patch) | |
| tree | 650176e845ef2d1e04a4dbc34e4e4eae4dc5f66e /drivers | |
| parent | f50cc9528850ed546b44894cdc7ab4ceb4b30550 (diff) | |
| download | u-boot-3cabcf966d42649cd60eb575c9cf5c22eb9e9123.tar.xz | |
x86: Move acpi_s3.h to include/acpi/
This header relates to ACPI and we are about to add some more ACPI
headers. Move this one into a new directory so they are together.
The header inclusion in pci_rom.c is not specific to x86 anymore, so drop
the #ifdef CONFIG_X86.
Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: Wolfgang Wallner <wolfgang.wallner@br-automation.com>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/pci/pci_rom.c | 4 | ||||
| -rw-r--r-- | drivers/power/acpi_pmc/acpi-pmc-uclass.c | 2 | ||||
| -rw-r--r-- | drivers/sysreset/sysreset_x86.c | 2 |
3 files changed, 3 insertions, 5 deletions
diff --git a/drivers/pci/pci_rom.c b/drivers/pci/pci_rom.c index 90f224b045..6b17f18bc0 100644 --- a/drivers/pci/pci_rom.c +++ b/drivers/pci/pci_rom.c @@ -33,12 +33,10 @@ #include <vbe.h> #include <video.h> #include <video_fb.h> +#include <acpi/acpi_s3.h> #include <linux/screen_info.h> -#ifdef CONFIG_X86 -#include <acpi_s3.h> DECLARE_GLOBAL_DATA_PTR; -#endif __weak bool board_should_run_oprom(struct udevice *dev) { diff --git a/drivers/power/acpi_pmc/acpi-pmc-uclass.c b/drivers/power/acpi_pmc/acpi-pmc-uclass.c index d43de87126..1c79f835c6 100644 --- a/drivers/power/acpi_pmc/acpi-pmc-uclass.c +++ b/drivers/power/acpi_pmc/acpi-pmc-uclass.c @@ -6,9 +6,9 @@ #define LOG_CATEGORY UCLASS_ACPI_PMC #include <common.h> -#include <acpi_s3.h> #include <dm.h> #include <log.h> +#include <acpi/acpi_s3.h> #ifdef CONFIG_X86 #include <asm/intel_pinctrl.h> #endif diff --git a/drivers/sysreset/sysreset_x86.c b/drivers/sysreset/sysreset_x86.c index 8e2d1eaa7a..bc91143560 100644 --- a/drivers/sysreset/sysreset_x86.c +++ b/drivers/sysreset/sysreset_x86.c @@ -6,11 +6,11 @@ */ #include <common.h> -#include <acpi_s3.h> #include <dm.h> #include <efi_loader.h> #include <pch.h> #include <sysreset.h> +#include <acpi/acpi_s3.h> #include <asm/io.h> #include <asm/processor.h> |