patch-2.1.97 linux/arch/sparc64/config.in

Next file: linux/arch/sparc64/defconfig
Previous file: linux/arch/sparc64/Makefile
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.96/linux/arch/sparc64/config.in linux/arch/sparc64/config.in
@@ -1,4 +1,4 @@
-# $Id: config.in,v 1.36 1998/01/10 19:04:30 ecd Exp $
+# $Id: config.in,v 1.44 1998/04/06 16:10:35 jj Exp $
 # For a description of the syntax of this configuration file,
 # see the Configure script.
 #
@@ -67,9 +67,6 @@
 if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
   tristate 'Solaris binary emulation' CONFIG_SOLARIS_EMUL
 fi
-if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
-  tristate 'Kernel Quad FPU (long double) and subnormal float/double emulation' CONFIG_MATHEMU
-fi
 endmenu
 
 if [ "$CONFIG_PCI" = "y" ]; then
@@ -84,6 +81,7 @@
       bool '    Support IEEE1284 status readback' CONFIG_PRINTER_READBACK
     fi
   fi
+  tristate 'SUNW,envctrl support' CONFIG_ENVCTRL
 fi
 
 mainmenu_option next_comment
@@ -109,14 +107,16 @@
 
 if [ "$CONFIG_PCI" = "y" ]; then
 	tristate 'Ultra/PCI IDE disk/cdrom/tape/floppy support' CONFIG_BLK_DEV_IDE
-	if [ "$CONFIG_BLK_DEV_IDE" = "y" ]; then
+	if [ "$CONFIG_BLK_DEV_IDE" != "n" ]; then
 	  dep_tristate '   Include IDE/ATA-2 DISK support' CONFIG_BLK_DEV_IDEDISK $CONFIG_BLK_DEV_IDE
 	  dep_tristate '   Include IDE/ATAPI CDROM support' CONFIG_BLK_DEV_IDECD $CONFIG_BLK_DEV_IDE
 	  dep_tristate '   Include IDE/ATAPI TAPE support' CONFIG_BLK_DEV_IDETAPE $CONFIG_BLK_DEV_IDE
 	  dep_tristate '   Include IDE/ATAPI FLOPPY support' CONFIG_BLK_DEV_IDEFLOPPY $CONFIG_BLK_DEV_IDE
 	  dep_tristate '   SCSI emulation support' CONFIG_BLK_DEV_IDESCSI $CONFIG_BLK_DEV_IDE
-	  define_bool CONFIG_IDE_CHIPSETS y
-	  define_bool CONFIG_BLK_DEV_NS87415_AX y
+	  define_bool CONFIG_BLK_DEV_IDEPCI y
+	  define_bool CONFIG_BLK_DEV_IDEDMA y
+	  define_bool CONFIG_BLK_DEV_NS87415 y
+	  define_bool CONFIG_BLK_DEV_CMD646 y
 	fi
 fi
 

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