summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBin Meng <bmeng.cn@gmail.com>2017-08-08 11:35:07 (GMT)
committerBin Meng <bmeng.cn@gmail.com>2017-08-08 13:13:05 (GMT)
commit323a6d691079bd15f0a9c0c9607bebadf958cd16 (patch)
tree8a03b911c03c5f9b0cb991d4061d9f2dacb5c714
parent091e51d20fcf3d4ec2fdc6e8a1f302be8ad49061 (diff)
downloadu-boot-fsl-qoriq-323a6d691079bd15f0a9c0c9607bebadf958cd16.tar.xz
x86: acpi: Fix build error with certain configuration
When CONFIG_EFI_PARTITION is not set, the following build error is seen in arch/x86/lib/acpi_s3.c: error: expected declaration specifiers or '...' before '*' token static void asmlinkage (*acpi_do_wakeup)(void *vector) = (void*)WAKEUP_BASE; This is actually caused by missing asmlinkage declaration, but with CONFIG_EFI_PARTITION on, the declaration comes from part.h which is included from common.h. Signed-off-by: Bin Meng <bmeng.cn@gmail.com> Reviewed-by: Stefan Roese <sr@denx.de>
-rw-r--r--arch/x86/lib/acpi_s3.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/lib/acpi_s3.c b/arch/x86/lib/acpi_s3.c
index 3175da8..182379b 100644
--- a/arch/x86/lib/acpi_s3.c
+++ b/arch/x86/lib/acpi_s3.c
@@ -8,6 +8,7 @@
#include <asm/acpi_s3.h>
#include <asm/acpi_table.h>
#include <asm/post.h>
+#include <linux/linkage.h>
DECLARE_GLOBAL_DATA_PTR;