From: Alistair Francis <alistair.francis@wdc.com>
Date: Fri, 24 May 2019 08:29:04 +0000 (+0200)
Subject: drivers/char: protect the asm/vpl011.h include
X-Git-Tag: archive/raspbian/4.14.0+80-gd101b417b7-1+rpi1^2~63^2~2163
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=cace51fe353c0c352571dda010bf6b00d37e7244;p=xen.git

drivers/char: protect the asm/vpl011.h include

The only use of asm/vpl011.h is protected by the CONFIG_SBSA_VUART_CONSOLE
define so lets protect the include as well.

Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
Acked-by: Stefano Stabellini <sstabellini@kernel.org>
---

diff --git a/xen/drivers/char/console.c b/xen/drivers/char/console.c
index 38ecd9c015..d728e737d1 100644
--- a/xen/drivers/char/console.c
+++ b/xen/drivers/char/console.c
@@ -36,7 +36,8 @@
 #ifdef CONFIG_X86
 #include <xen/consoled.h>
 #include <asm/guest.h>
-#else
+#endif
+#ifdef CONFIG_SBSA_VUART_CONSOLE
 #include <asm/vpl011.h>
 #endif