aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGraeme Gregory <graeme.gregory@linaro.org>2013-11-21 11:49:13 +0000
committerGraeme Gregory <graeme.gregory@linaro.org>2013-11-21 12:19:42 +0000
commitcca85106dc1b3a7a22c3c670e0e1dc3692e1a383 (patch)
treeb0c60b261bdffd676fe027f9a10ecf0fe6664962
parentaae006e1639c80d9a84d8e86b99e913a001392b1 (diff)
downloadleg-kernel-cca85106dc1b3a7a22c3c670e0e1dc3692e1a383.tar.gz
ARM: 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/arm/kernel/setup.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c
index c3ed15990f66..953ac40caa8a 100644
--- a/arch/arm/kernel/setup.c
+++ b/arch/arm/kernel/setup.c
@@ -30,9 +30,7 @@
#include <linux/bug.h>
#include <linux/compiler.h>
#include <linux/sort.h>
-#ifdef CONFIG_ACPI
#include <linux/acpi.h>
-#endif
#include <asm/unified.h>
#include <asm/cp15.h>