patch-2.1.109 linux/arch/alpha/config.in

Next file: linux/arch/alpha/kernel/alpha_ksyms.c
Previous file: linux/Makefile
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.108/linux/arch/alpha/config.in linux/arch/alpha/config.in
@@ -173,10 +173,6 @@
 #bool 'Echo console messages on /dev/ttyS0 (COM1)' CONFIG_SERIAL_ECHO
 
 if [ "$CONFIG_PCI" = "y" ]; then
-  bool 'TGA Console Support' CONFIG_TGA_CONSOLE
-#  if [ "$CONFIG_TGA_CONSOLE" = "y" ]; then
-#    bool 'VGA Console Support' CONFIG_VGA_CONSOLE
-#  fi
   bool 'PCI quirks' CONFIG_PCI_QUIRKS
   if [ "$CONFIG_PCI_QUIRKS" = "y" -a "$CONFIG_EXPERIMENTAL" = "y" ]; then
     bool 'PCI bridge optimization (experimental)' CONFIG_PCI_OPTIMIZE
@@ -203,12 +199,6 @@
 fi
 endmenu
 
-bool 'Support for frame buffer devices' CONFIG_FB
-if [ "$CONFIG_FB" = "y" ]; then
-  define_bool CONFIG_PCI_CONSOLE y
-fi
-source drivers/video/Config.in
-
 source drivers/pnp/Config.in
 
 source drivers/block/Config.in
@@ -264,6 +254,18 @@
 
 source drivers/char/Config.in
 
+if [ "$CONFIG_VT" = "y" ]; then
+  mainmenu_option next_comment
+  comment 'Console drivers'
+  bool 'VGA text console' CONFIG_VGA_CONSOLE
+  bool 'Support for frame buffer devices' CONFIG_FB
+  if [ "$CONFIG_FB" = "y" ]; then
+    define_bool CONFIG_PCI_CONSOLE y
+  fi
+  source drivers/video/Config.in
+  endmenu
+fi
+
 mainmenu_option next_comment
 comment 'Sound'
 
@@ -289,7 +291,3 @@
 
 bool 'Magic SysRq key' CONFIG_MAGIC_SYSRQ
 endmenu
-
-if [ "$CONFIG_TGA_CONSOLE" = "n" ]; then
-  define_bool CONFIG_VGA_CONSOLE y
-fi

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov