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

• Lines: 91
• Date: Fri Nov 22 15:56:34 1996
• Orig file: v2.1.11/linux/arch/m68k/config.in
• Orig date: Sun Nov 10 20:12:08 1996

diff -u --recursive --new-file v2.1.11/linux/arch/m68k/config.in linux/arch/m68k/config.in
@@ -29,12 +29,14 @@
 bool '68020 support' CONFIG_M68020
 bool '68030 support' CONFIG_M68030
 bool '68040 support' CONFIG_M68040
-if [ "$CONFIG_M68040" = "y" ]; then
-  bool 'Use 68040 specific optimizations' CONFIG_OPTIMIZE_040
-fi
 bool '68060 support' CONFIG_M68060
-if [ "$CONFIG_M68060" = "y" ]; then
-  bool 'Use 68060 specific optimizations' CONFIG_OPTIMIZE_060
+if [ "$CONFIG_M68020" = "n" -a "$CONFIG_M68030" = "n" ]; then
+  if [ "$CONFIG_M68040" = "y" -a "$CONFIG_M68060" = "n" ]; then
+    bool 'Use 68040 specific optimizations' CONFIG_OPTIMIZE_040
+  fi
+  if [ "$CONFIG_M68040" = "n" -a "$CONFIG_M68060" = "y" ]; then
+    bool 'Use 68060 specific optimizations' CONFIG_OPTIMIZE_060
+  fi
 fi
 bool 'Advanced processor options' CONFIG_ADVANCED_CPU
 if [ "$CONFIG_ADVANCED_CPU" = "y" ]; then
@@ -56,11 +58,11 @@
   bool 'Amiga ECS chipset support' CONFIG_AMIFB_ECS
   bool 'Amiga AGA chipset support' CONFIG_AMIFB_AGA
   bool 'Amiga Cybervision support' CONFIG_FB_CYBER
-  bool 'Amiga GSP (TMS340x0) support' CONFIG_AMIGA_GSP
-  if [ "$CONFIG_AMIGA_GSP" = "y" ]; then
-    bool 'DMI Resolver support' CONFIG_GSP_RESOLVER
+#  bool 'Amiga GSP (TMS340x0) support' CONFIG_AMIGA_GSP
+#  if [ "$CONFIG_AMIGA_GSP" = "y" ]; then
+#    bool 'DMI Resolver support' CONFIG_GSP_RESOLVER
 #    bool 'A2410 support' CONFIG_GSP_A2410
-  fi
+#  fi
 fi
 endmenu
 
@@ -82,11 +84,11 @@
 tristate 'Amiga Zorro II ramdisk support' CONFIG_AMIGA_Z2RAM
 fi
 if [ "$CONFIG_ATARI" = "y" ]; then
-bool 'Atari ACSI support' CONFIG_ATARI_ACSI
-if [ "$CONFIG_ATARI_ACSI" = "y" ]; then
+tristate 'Atari ACSI support' CONFIG_ATARI_ACSI
+if [ "$CONFIG_ATARI_ACSI" != "n" ]; then
 comment 'Some devices (e.g. CD jukebox) support multiple LUNs'
 bool 'Probe all LUNs on each ACSI device' CONFIG_ACSI_MULTI_LUN
-bool 'Atari SLM laser printer support' CONFIG_ATARI_SLM
+dep_tristate 'Atari SLM laser printer support' CONFIG_ATARI_SLM $CONFIG_ATARI_ACSI
 fi
 fi
 
@@ -132,10 +134,13 @@
 comment 'SCSI low-level drivers'
 
 if [ "$CONFIG_AMIGA" = "y" ]; then
-bool 'A3000 WD33C93A support' CONFIG_A3000_SCSI
-bool 'A2091 WD33C93A support' CONFIG_A2091_SCSI
-bool 'GVP Series II WD33C93A support' CONFIG_GVP11_SCSI
+tristate 'A3000 WD33C93A support' CONFIG_A3000_SCSI
+tristate 'A2091 WD33C93A support' CONFIG_A2091_SCSI
+tristate 'GVP Series II WD33C93A support' CONFIG_GVP11_SCSI
 bool 'CyberStorm SCSI support' CONFIG_CYBERSTORM_SCSI
+bool 'CyberStorm SCSI Mk II support' CONFIG_CYBERSTORMII_SCSI
+bool 'Blizzard 2060 SCSI support' CONFIG_BLZ2060_SCSI
+bool 'Blizzard 1230IV/1260 SCSI support' CONFIG_BLZ1230_SCSI
 fi
 if [ "$CONFIG_ATARI" = "y" ]; then
 dep_tristate 'Atari native SCSI support' CONFIG_ATARI_SCSI $CONFIG_SCSI
@@ -191,8 +196,9 @@
 mainmenu_option next_comment
 comment 'Character devices'
 
-bool 'Parallel printer support' CONFIG_PRINTER
+tristate 'Parallel printer support' CONFIG_PRINTER
 if [ "$CONFIG_AMIGA" = "y" ]; then
+  dep_tristate 'Multiface Card III parallel support' CONFIG_MULTIFACE_III_LP $CONFIG_PRINTER
   tristate 'Amiga mouse support' CONFIG_AMIGAMOUSE
 fi
 if [ "$CONFIG_ATARI" = "y" ]; then
@@ -220,9 +226,9 @@
 mainmenu_option next_comment
 comment 'Sound support'
 
-bool 'Sound support' CONFIG_SOUND y
+tristate 'Sound support' CONFIG_SOUND
 if [ "$CONFIG_SOUND" != "n" ]; then
-  bool 'Amiga or Atari DMA sound support' CONFIG_DMASOUND y
+  dep_tristate 'Amiga or Atari DMA sound support' CONFIG_DMASOUND $CONFIG_SOUND
 fi
 endmenu