X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fdevices%2FKconfig;h=575223b0cb4b58ce870a1a0990c8edabbea66140;hb=ead9425b90a4adf9e7dc9b97086796b9323d6d42;hp=86c8dfcecc5cdfadeac50c2888bed95aedc84566;hpb=9d406e84682878859284200ae00251d27c53c845;p=palacios.git

diff --git a/palacios/src/devices/Kconfig b/palacios/src/devices/Kconfig
index 86c8dfc..575223b 100644
--- a/palacios/src/devices/Kconfig
+++ b/palacios/src/devices/Kconfig
@@ -156,7 +156,7 @@ config DEBUG_VIRTIO_SYM
 config LINUX_VIRTIO_NET
         bool "Enable Virtio Network Device"
         default n
-	depends on PCI && EXPERIMENTAL
+	depends on PCI && VNET
         help
           Enable the Virtio Net
 
@@ -171,7 +171,7 @@ config DEBUG_VIRTIO_NET
 config LINUX_VIRTIO_VNET
         bool "Enable Virtio VNET interface"
         default n
-        depends on PCI && EXPERIMENTAL && VNET
+        depends on PCI && VNET
         help
           Enable the Virtio VNET interface for Control VM
 
@@ -186,12 +186,12 @@ config DEBUG_LINUX_VIRTIO_VNET
 config VNET_NIC
         bool "Enable VNET Backend Device"
         default n
-	depends on PCI && EXPERIMENTAL && VNET
+	depends on PCI && VNET
         help
           Enable the VNET backend device
 
 config DEBUG_VNET_NIC
-        bool "VNET NIC Device Debugging"
+        bool "VNET Backend Device Debugging"
         default n
         depends on VNET_NIC && DEBUG_ON
         help
@@ -366,7 +366,7 @@ config RAMDISK
 	  Includes the RAM based disk backend
 
 config DEBUG_RAMDISK
-	bool "RAMDISK baskend debugging"
+	bool "RAMDISK backend debugging"
 	depends on RAMDISK && DEBUG_ON
 	help 
 	  Enable debugging for the ram based disk backend 	
@@ -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 
 
@@ -454,17 +453,10 @@ config SERIAL_UART
 
 config CHAR_STREAM
 	bool "Stream based character frontend"
+	depends on STREAM
 	default n
 	help
 	  Include Stream based character device frontend
 
-
-config MCHECK
-	bool "Machine Check architecture"
-	default n
-	depends on EXPERIMENTAL
-	help 
-	  Include Machine Check injection architecture
-
 endmenu