aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeoff Levand <geoff@infradead.org>2015-03-30 11:14:19 -0700
committerGraeme Gregory <graeme.gregory@linaro.org>2015-07-07 14:36:06 +0100
commit325c9758bd4b7f35faa83e1fb89332ca0800dab5 (patch)
treef9b72ebc624171ee773ef67387aa37255e068627
parent3a7e01c1a07ab29d1f7ba07e8167fda45e757e3c (diff)
downloadleg-kernel-325c9758bd4b7f35faa83e1fb89332ca0800dab5.tar.gz
acpi: fix build error
Signed-off-by: Geoff Levand <geoff@infradead.org>
-rw-r--r--arch/arm64/kernel/setup.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm64/kernel/setup.c b/arch/arm64/kernel/setup.c
index 4dde06f6fedb..0f9ee680c140 100644
--- a/arch/arm64/kernel/setup.c
+++ b/arch/arm64/kernel/setup.c
@@ -575,8 +575,10 @@ static int __init arm64_spcr_setup(void)
* If ACPI is enabled, scan the tables for
* automatic console configuration
*/
+#if defined(CONFIG_ACPI_SPCR)
if (!acpi_disabled)
acpi_setup_spcr();
+#endif
return 0;
}