patch-2.1.116 linux/arch/m68k/config.in

• Lines: 48
• Date: Mon Aug 10 11:02:24 1998
• Orig file: v2.1.115/linux/arch/m68k/config.in
• Orig date: Thu Aug 6 14:06:28 1998

diff -u --recursive --new-file v2.1.115/linux/arch/m68k/config.in linux/arch/m68k/config.in
@@ -235,11 +235,23 @@
     tristate 'PAMsNet support' CONFIG_ATARI_PAMSNET
   fi
 fi
+fi
 endmenu
 
 fi
+
+source fs/Config.in
+
+if [ "$CONFIG_VME" = "n" ]; then
+  define_bool CONFIG_FB y
+  mainmenu_option next_comment
+  comment 'Console drivers'
+  source drivers/video/Config.in
+  endmenu
 fi
 
+source fs/nls/Config.in
+
 mainmenu_option next_comment
 comment 'Character devices'
  
@@ -254,7 +266,7 @@
   define_bool CONFIG_NVRAM y
 fi
 
-tristate 'Parallel printer support' CONFIG_PRINTER
+tristate 'Parallel printer support' CONFIG_M68K_PRINTER
 if [ "$CONFIG_ZORRO" = "y" ]; then
   dep_tristate 'Multiface Card III parallel support' CONFIG_MULTIFACE_III_LP $CONFIG_PRINTER
 fi
@@ -334,14 +346,6 @@
 fi
 endmenu
 
-source fs/Config.in
-
-if [ "$CONFIG_VME" = "n" ]; then
-  define_bool CONFIG_FB y
-  source drivers/video/Config.in
-fi
-
-source fs/nls/Config.in
 mainmenu_option next_comment
 comment 'Sound support'