[PATCH RFC 6/7] xen: Remove redundant xen/include/xen/vga.h file

[Daniel Kiper <daniel.kiper@oracle.com>]

xen/include/xen/vga.h just include xen/include/xen/video.h.
So, remove it because it is redundant file.

Signed-off-by: Daniel Kiper <daniel.kiper@oracle.com>
---
 xen/arch/x86/efi/boot.c   |    2 +-
 xen/arch/x86/setup.c      |    2 +-
 xen/drivers/video/vesa.c  |    2 +-
 xen/drivers/video/vga.c   |    2 +-
 xen/include/asm-x86/xbi.h |    2 +-
 xen/include/xen/vga.h     |   14 --------------
 6 files changed, 5 insertions(+), 19 deletions(-)
 delete mode 100644 xen/include/xen/vga.h

diff --git a/xen/arch/x86/efi/boot.c b/xen/arch/x86/efi/boot.c
index fea5598..4ad9352 100644
--- a/xen/arch/x86/efi/boot.c
+++ b/xen/arch/x86/efi/boot.c
@@ -16,7 +16,7 @@
 #endif
 #include <xen/string.h>
 #include <xen/stringify.h>
-#include <xen/vga.h>
+#include <xen/video.h>
 #include <asm/e820.h>
 #include <asm/edd.h>
 #define __ASSEMBLY__ /* avoid pulling in ACPI stuff (conflicts with EFI) */
diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c
index b3bf26a..75fbb3a 100644
--- a/xen/arch/x86/setup.c
+++ b/xen/arch/x86/setup.c
@@ -20,7 +20,7 @@
 #include <xen/keyhandler.h>
 #include <xen/numa.h>
 #include <xen/rcupdate.h>
-#include <xen/vga.h>
+#include <xen/video.h>
 #include <xen/dmi.h>
 #include <xen/pfn.h>
 #include <xen/nodemask.h>
diff --git a/xen/drivers/video/vesa.c b/xen/drivers/video/vesa.c
index 8941ac3..e1fe662 100644
--- a/xen/drivers/video/vesa.c
+++ b/xen/drivers/video/vesa.c
@@ -9,7 +9,7 @@
 #include <xen/lib.h>
 #include <xen/xmalloc.h>
 #include <xen/kernel.h>
-#include <xen/vga.h>
+#include <xen/video.h>
 #include <asm/io.h>
 #include <asm/page.h>
 #include <asm/xbi.h>
diff --git a/xen/drivers/video/vga.c b/xen/drivers/video/vga.c
index feb9b31..5089fea 100644
--- a/xen/drivers/video/vga.c
+++ b/xen/drivers/video/vga.c
@@ -8,7 +8,7 @@
 #include <xen/init.h>
 #include <xen/lib.h>
 #include <xen/mm.h>
-#include <xen/vga.h>
+#include <xen/video.h>
 #include <xen/pci.h>
 #include <asm/io.h>
 #include <asm/xbi.h>
diff --git a/xen/include/asm-x86/xbi.h b/xen/include/asm-x86/xbi.h
index ca9e615..a86bb55 100644
--- a/xen/include/asm-x86/xbi.h
+++ b/xen/include/asm-x86/xbi.h
@@ -19,7 +19,7 @@
 #define __XBI_H__
 
 #include <xen/types.h>
-#include <xen/vga.h>
+#include <xen/video.h>
 
 #include <asm/e820.h>
 #include <asm/edd.h>
diff --git a/xen/include/xen/vga.h b/xen/include/xen/vga.h
deleted file mode 100644
index 3d5c331..0000000
--- a/xen/include/xen/vga.h
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
- *  vga.h
- *
- *  This file is subject to the terms and conditions of the GNU General Public
- *  License.  See the file COPYING in the main directory of this archive
- *  for more details.
- */
-
-#ifndef _XEN_VGA_H
-#define _XEN_VGA_H
-
-#include <xen/video.h>
-
-#endif /* _XEN_VGA_H */
-- 
1.7.10.4