aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGraeme Gregory <graeme.gregory@linaro.org>2013-11-21 11:50:08 +0000
committerGraeme Gregory <graeme.gregory@linaro.org>2013-11-21 12:19:51 +0000
commit1143fd18461b3a363cb7866892b3ad4345ba4c53 (patch)
treea0bf107bf11dc26485187a5a573118f5c2a8da04
parentcca85106dc1b3a7a22c3c670e0e1dc3692e1a383 (diff)
downloadleg-kernel-1143fd18461b3a363cb7866892b3ad4345ba4c53.tar.gz
ARM64: ACPI: removce #if around acpi.h
Internally include file is already protected in the case of #ifndef CONFIG_ACPI so we don't need these checks. Signed-off-by: Graeme Gregory <graeme.gregory@linaro.org> Acked-by: Hanjun Guo <hanjun.guo@linaro.org>
-rw-r--r--arch/arm64/kernel/setup.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/arm64/kernel/setup.c b/arch/arm64/kernel/setup.c
index 75c59954e08d..69f283b0c762 100644
--- a/arch/arm64/kernel/setup.c
+++ b/arch/arm64/kernel/setup.c
@@ -41,9 +41,7 @@
#include <linux/memblock.h>
#include <linux/of_fdt.h>
#include <linux/of_platform.h>
-#ifdef CONFIG_ACPI
#include <linux/acpi.h>
-#endif
#include <asm/fixmap.h>
#include <asm/cputype.h>
@@ -58,9 +56,7 @@
#include <asm/memblock.h>
#include <asm/psci.h>
#include <asm/cpu.h>
-#ifdef CONFIG_ACPI
#include <asm/acpi.h>
-#endif
unsigned int processor_id;
EXPORT_SYMBOL(processor_id);