X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=src%2Fdevices%2FKconfig;h=9e5ea6e09445a698564ecfaa530f2010785ab314;hb=df6fd566ba6f8541ee5611e57bfbab58b632a269;hp=151492d6c8c9a3db065f43e91c923386ba68788b;hpb=01ce601bdb4e664b502e8816a3e13e7b1d275e50;p=coreboot.git

diff --git a/src/devices/Kconfig b/src/devices/Kconfig
index 151492d6c..9e5ea6e09 100644
--- a/src/devices/Kconfig
+++ b/src/devices/Kconfig
@@ -46,7 +46,7 @@ choice
 	prompt "Option ROM execution type"
 	default PCI_OPTION_ROM_RUN_YABEL if !ARCH_X86
 	default PCI_OPTION_ROM_RUN_REALMODE if ARCH_X86
-	depends on PCI_ROM_RUN || VGA_ROM_RUN
+	depends on PCI_ROM_RUN || VGA_ROM_RUN || GEODE_VSA
 
 config PCI_OPTION_ROM_RUN_REALMODE
 	prompt "Native mode"
@@ -61,6 +61,7 @@ config PCI_OPTION_ROM_RUN_REALMODE
 config PCI_OPTION_ROM_RUN_YABEL
 	prompt "Secure mode"
 	bool
+	depends on !GEODE_VSA
 	help
 	  If you select this option, the x86emu CPU emulator will be used to
 	  execute PCI option ROMs.
@@ -115,7 +116,7 @@ config YABEL_DIRECTHW
 	  they can still access all devices in the system.
 	  Enable this option for a good compromise between security and speed.
 
-config CONSOLE_VGA_MULTI
+config MULTIPLE_VGA_ADAPTERS
 	bool
 	default n