Merge branch 'devel' of palacios@newskysaw.cs.northwestern.edu:/home/palacios/palacio...

diff --combined palacios/src/devices/Kconfig
index cf45c27,d49bb9e..81e1739
--- 1/palacios/src/devices/Kconfig
--- 2/palacios/src/devices/Kconfig
+++ b/palacios/src/devices/Kconfig
@@@ -156,7 -156,7 +156,7 @@@ config DEBUG_VIRTIO_SY
  config LINUX_VIRTIO_NET
          bool "Enable Virtio Network Device"
          default n
 -      depends on PCI
 +      depends on PCI && VNET
          help
            Enable the Virtio Net
  
@@@ -402,7 -402,7 +402,7 @@@ config DISK_MODE
  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 +420,6 @@@ config DEBUG_VG
  config CGA
        bool "CGA"
        default n
-       depends on !PASSTHROUGH_VIDEO
        help
          Includes the Virtual CGA video support
  
@@@ -435,14 -434,14 +434,14 @@@ config DEBUG_CG
  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