From: Jack Lange <jacklange@cs.pitt.edu>
Date: Wed, 25 May 2011 20:36:04 +0000 (-0500)
Subject: Merge branch 'devel' of ssh://palacios@newskysaw/home/palacios/palacios into devel
X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=commitdiff_plain;h=152a4d5983cb45f3d8b548ff1af35539603de983;hp=537212e255e59b086004e0eb156a31d248dd7508;p=palacios.releases.git

Merge branch 'devel' of ssh://palacios@newskysaw/home/palacios/palacios into devel
---

diff --git a/palacios/src/devices/Kconfig b/palacios/src/devices/Kconfig
index 3610f2f..d49bb9e 100644
--- a/palacios/src/devices/Kconfig
+++ b/palacios/src/devices/Kconfig
@@ -402,7 +402,7 @@ config DISK_MODEL
 config VGA
 	bool "VGA"
 	default n
-	depends on !PASSTHROUGH_VIDEO && GRAPHICS_CONSOLE
+	depends GRAPHICS_CONSOLE
 	help
 	  Includes the Virtual VGA video support, and will 
           eventually also include SVGA
@@ -420,7 +420,6 @@ config DEBUG_VGA
 config CGA
 	bool "CGA"
 	default n
-	depends on !PASSTHROUGH_VIDEO
 	help
 	  Includes the Virtual CGA video support
 
@@ -435,14 +434,14 @@ config DEBUG_CGA
 config TELNET_CONSOLE
 	bool "Telnet Virtual Console"
 	default n
-	depends on CGA && !PASSTHROUGH_VIDEO
+	depends on CGA
 	help
 	  Includes the virtual telnet console 
 
 config CURSES_CONSOLE
 	bool "Curses Virtual Console"
 	default n
-	depends on CGA && !PASSTHROUGH_VIDEO
+	depends on CGA && CONSOLE
 	help
 	  Includes the virtual curses console