diff options
| author | Tom Rini <trini@konsulko.com> | 2017-10-27 08:50:16 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-10-27 08:50:16 -0400 |
| commit | ae6ac0a06e5e6c58cf133c6b50d80b62501af465 (patch) | |
| tree | 61864a201560d3e5652600c0d79ab219f1b98450 /arch/x86/include | |
| parent | ddeaaefde3161bf655d48d733f3b1915e8222361 (diff) | |
| parent | 411898dc87c09d0cd103a4243c8cb4a72b115c51 (diff) | |
Merge git://git.denx.de/u-boot-x86
Diffstat (limited to 'arch/x86/include')
| -rw-r--r-- | arch/x86/include/asm/acpi/sleepstates.asl (renamed from arch/x86/include/asm/arch-baytrail/acpi/sleepstates.asl) | 0 | ||||
| -rw-r--r-- | arch/x86/include/asm/arch-baytrail/acpi/platform.asl | 2 | ||||
| -rw-r--r-- | arch/x86/include/asm/arch-quark/acpi/platform.asl | 2 | ||||
| -rw-r--r-- | arch/x86/include/asm/arch-quark/acpi/sleepstates.asl | 10 |
4 files changed, 2 insertions, 12 deletions
diff --git a/arch/x86/include/asm/arch-baytrail/acpi/sleepstates.asl b/arch/x86/include/asm/acpi/sleepstates.asl index 5600723084..5600723084 100644 --- a/arch/x86/include/asm/arch-baytrail/acpi/sleepstates.asl +++ b/arch/x86/include/asm/acpi/sleepstates.asl diff --git a/arch/x86/include/asm/arch-baytrail/acpi/platform.asl b/arch/x86/include/asm/arch-baytrail/acpi/platform.asl index a80d2c0e51..cf3de7cde4 100644 --- a/arch/x86/include/asm/arch-baytrail/acpi/platform.asl +++ b/arch/x86/include/asm/arch-baytrail/acpi/platform.asl @@ -36,4 +36,4 @@ Scope (\_SB) } /* Chipset specific sleep states */ -#include "sleepstates.asl" +#include <asm/acpi/sleepstates.asl> diff --git a/arch/x86/include/asm/arch-quark/acpi/platform.asl b/arch/x86/include/asm/arch-quark/acpi/platform.asl index 1ecf153c0f..db59c460e3 100644 --- a/arch/x86/include/asm/arch-quark/acpi/platform.asl +++ b/arch/x86/include/asm/arch-quark/acpi/platform.asl @@ -33,4 +33,4 @@ Scope (\_SB) } /* Chipset specific sleep states */ -#include "sleepstates.asl" +#include <asm/acpi/sleepstates.asl> diff --git a/arch/x86/include/asm/arch-quark/acpi/sleepstates.asl b/arch/x86/include/asm/arch-quark/acpi/sleepstates.asl deleted file mode 100644 index 63c82fa123..0000000000 --- a/arch/x86/include/asm/arch-quark/acpi/sleepstates.asl +++ /dev/null @@ -1,10 +0,0 @@ -/* - * Copyright (C) 2016, Bin Meng <bmeng.cn@gmail.com> - * - * SPDX-License-Identifier: GPL-2.0+ - */ - -Name(\_S0, Package() {0x0, 0x0, 0x0, 0x0}) -Name(\_S3, Package() {0x5, 0x0, 0x0, 0x0}) -Name(\_S4, Package() {0x6, 0x0, 0x0, 0x0}) -Name(\_S5, Package() {0x7, 0x0, 0x0, 0x0}) |