[PATCH] Fix warning in grub-emu compilation for i386-coreboot

[Pavel Roskin]

Add include/grub/util/console.h, which matches utils/console.c and
always declares grub_console_init() and grub_console_fini(), unlike the
machine specific headers.

ChangeLog:

        * include/grub/util/console.h: New file.
        * util/console.c: Use it.
        * util/grub-emu.c: Likewise.
---

 include/grub/util/console.h |   28 ++++++++++++++++++++++++++++
 util/console.c              |    2 +-
 util/grub-emu.c             |    2 +-
 3 files changed, 30 insertions(+), 2 deletions(-)
 create mode 100644 include/grub/util/console.h

diff --git a/include/grub/util/console.h b/include/grub/util/console.h
new file mode 100644
index 0000000..1e55682
--- /dev/null
+++ b/include/grub/util/console.h
@@ -0,0 +1,28 @@
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2009  Free Software Foundation, Inc.
+ *
+ *  GRUB is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  GRUB is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef GRUB_CONSOLE_UTIL_HEADER
+#define GRUB_CONSOLE_UTIL_HEADER       1
+
+/* Initialize the console system.  */
+void grub_console_init (void);
+
+/* Finish the console system.  */
+void grub_console_fini (void);
+
+#endif /* ! GRUB_CONSOLE_UTIL_HEADER */
diff --git a/util/console.c b/util/console.c
index 04bb56d..9d8bb1a 100644
--- a/util/console.c
+++ b/util/console.c
@@ -35,7 +35,7 @@
 # define A_STANDOUT    0
 #endif /* ! A_STANDOUT */
 
-#include <grub/machine/console.h>
+#include <grub/util/console.h>
 #include <grub/term.h>
 #include <grub/types.h>
 
diff --git a/util/grub-emu.c b/util/grub-emu.c
index 31365f3..664a0b1 100644
--- a/util/grub-emu.c
+++ b/util/grub-emu.c
@@ -29,7 +29,7 @@
 #include <grub/fs.h>
 #include <grub/util/hostdisk.h>
 #include <grub/dl.h>
-#include <grub/machine/console.h>
+#include <grub/util/console.h>
 #include <grub/util/misc.h>
 #include <grub/kernel.h>
 #include <grub/normal.h>