[src/trunk]: src/sys/arch/x86/x86 Back out r1.30 change.

[nonaka <nonaka%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/908d87c724d5
branches:  trunk
changeset: 451695:908d87c724d5
user:      nonaka <nonaka%NetBSD.org@localhost>
date:      Fri May 31 03:10:31 2019 +0000

description:
Back out r1.30 change.

> tuck in include inside ifdef, from Ryosuke Moro

It was caused by the reporter's local change.

diffstat:

 sys/arch/x86/x86/consinit.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (28 lines):

diff -r 1fe8d3c5bb6a -r 908d87c724d5 sys/arch/x86/x86/consinit.c
--- a/sys/arch/x86/x86/consinit.c       Fri May 31 02:35:08 2019 +0000
+++ b/sys/arch/x86/x86/consinit.c       Fri May 31 03:10:31 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: consinit.c,v 1.30 2019/05/26 00:30:35 christos Exp $   */
+/*     $NetBSD: consinit.c,v 1.31 2019/05/31 03:10:31 nonaka Exp $     */
 
 /*
  * Copyright (c) 1998
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: consinit.c,v 1.30 2019/05/26 00:30:35 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: consinit.c,v 1.31 2019/05/31 03:10:31 nonaka Exp $");
 
 #include "opt_kgdb.h"
 #include "opt_puc.h"
@@ -92,8 +92,8 @@
 #endif
 
 #ifndef XEN
+#include "hvkbd.h"
 #if NHVKBD > 0
-#include "hvkbd.h"
 #include <dev/hyperv/hvkbdvar.h>
 #endif
 #endif