diff --git a/xen/arch/x86/Kconfig b/xen/arch/x86/Kconfig
index ca233b7dd4..73f79cc3ea 100644
--- a/xen/arch/x86/Kconfig
+++ b/xen/arch/x86/Kconfig
@@ -19,8 +19,8 @@ config X86
 	select HAS_PASSTHROUGH
 	select HAS_PCI
 	select HAS_PDX
-	select HAS_VGA
 	select NUMA
+	select VGA
 
 config ARCH_DEFCONFIG
 	string
diff --git a/xen/drivers/video/Kconfig b/xen/drivers/video/Kconfig
index 8b25694b32..03e1e18ae8 100644
--- a/xen/drivers/video/Kconfig
+++ b/xen/drivers/video/Kconfig
@@ -3,8 +3,8 @@
 config HAS_VIDEO
 	bool
 
-# Select HAS_VGA if VGA is supported
-config HAS_VGA
+# Select VGA if VGA is supported
+config VGA
 	bool
 	select HAS_VIDEO
 
diff --git a/xen/drivers/video/Makefile b/xen/drivers/video/Makefile
index b9b5e2347e..fab7aba70d 100644
--- a/xen/drivers/video/Makefile
+++ b/xen/drivers/video/Makefile
@@ -1,7 +1,7 @@
-obj-$(CONFIG_HAS_VGA) := vga.o
+obj-$(CONFIG_VGA) := vga.o
 obj-$(CONFIG_HAS_VIDEO) += font_8x14.o
 obj-$(CONFIG_HAS_VIDEO) += font_8x16.o
 obj-$(CONFIG_HAS_VIDEO) += font_8x8.o
 obj-$(CONFIG_HAS_VIDEO) += lfb.o
-obj-$(CONFIG_HAS_VGA) += vesa.o
+obj-$(CONFIG_VGA) += vesa.o
 obj-$(CONFIG_HAS_ARM_HDLCD) += arm_hdlcd.o
diff --git a/xen/include/asm-x86/config.h b/xen/include/asm-x86/config.h
index 08addfb8a4..004a7f6a2f 100644
--- a/xen/include/asm-x86/config.h
+++ b/xen/include/asm-x86/config.h
@@ -42,7 +42,6 @@
 #define CONFIG_ACPI_SRAT 1
 #define CONFIG_ACPI_CSTATE 1
 
-#define CONFIG_VGA 1
 #define CONFIG_VIDEO 1
 
 #define CONFIG_WATCHDOG 1