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

Next file: linux/arch/sparc64/defconfig
Previous file: linux/arch/sparc/mm/sun4c.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.4.2/linux/arch/sparc64/config.in linux/arch/sparc64/config.in
@@ -1,4 +1,4 @@
-# $Id: config.in,v 1.130 2001/01/18 04:47:44 davem Exp $
+# $Id: config.in,v 1.136 2001/03/24 06:04:24 davem Exp $
 # For a description of the syntax of this configuration file,
 # see the Configure script.
 #
@@ -47,6 +47,9 @@
 define_bool CONFIG_SUN_AUXIO y
 define_bool CONFIG_SUN_IO y
 bool 'PCI support' CONFIG_PCI
+if [ "$CONFIG_PCI" = "y" ] ; then
+   define_bool CONFIG_RTC y
+fi
 source drivers/pci/Config.in
 
 tristate 'Openprom tree appears in /proc/openprom' CONFIG_SUN_OPENPROMFS
@@ -74,6 +77,7 @@
    tristate 'SUNW, envctrl support' CONFIG_ENVCTRL
    tristate '7-Segment Display support' CONFIG_DISPLAY7SEG
    tristate 'CP1XXX Hardware Watchdog support' CONFIG_WATCHDOG_CP1XXX
+   tristate 'RIO Hardware Watchdog support' CONFIG_WATCHDOG_RIO
 fi
 endmenu
 
@@ -165,12 +169,14 @@
    dep_tristate 'PTI Qlogic, ISP Driver' CONFIG_SCSI_QLOGICPTI $CONFIG_SCSI
 
    if [ "$CONFIG_PCI" != "n" ]; then
-      dep_tristate 'Adaptec AIC7xxx support' CONFIG_SCSI_AIC7XXX $CONFIG_SCSI
-      if [ "$CONFIG_SCSI_AIC7XXX" != "n" ]; then
-	 bool '  Enable tagged command queueing (TCQ) by default' CONFIG_AIC7XXX_TAGGED_QUEUEING
-	 int  '  Maximum number of TCQ commands per device' CONFIG_AIC7XXX_CMDS_PER_DEVICE 8
-  	 bool '  Collect statistics to report in /proc' CONFIG_AIC7XXX_PROC_STATS
-	 int  '  Delay in seconds after SCSI bus reset' CONFIG_AIC7XXX_RESET_DELAY 5
+      source drivers/scsi/aic7xxx/Config.in
+      if [ "$CONFIG_SCSI_AIC7XXX" != "y" ]; then
+         dep_tristate 'Old Adaptec AIC7xxx support' CONFIG_SCSI_AIC7XXX_OLD $CONFIG_SCSI
+         if [ "$CONFIG_SCSI_AIC7XXX_OLD" != "n" ]; then
+            bool '  Enable Tagged Command Queueing (TCQ) by default' CONFIG_AIC7XXX_OLD_TCQ_ON_BY_DEFAULT
+            int  '  Maximum number of TCQ commands per device' CONFIG_AIC7XXX_OLD_CMDS_PER_DEVICE 8
+            bool '  Collect statistics to report in /proc' CONFIG_AIC7XXX_OLD_PROC_STATS
+         fi
       fi
       dep_tristate 'NCR53C8XX SCSI support' CONFIG_SCSI_NCR53C8XX $CONFIG_SCSI
       dep_tristate 'SYM53C8XX SCSI support' CONFIG_SCSI_SYM53C8XX $CONFIG_SCSI
@@ -197,8 +203,6 @@
 fi
 endmenu
 
-source drivers/message/fusion/Config.in
-
 source drivers/fc4/Config.in
 
 if [ "$CONFIG_PCI" = "y" -a "$CONFIG_EXPERIMENTAL" = "y" ]; then
@@ -284,6 +288,7 @@
 	    bool '  Omit support for old Tigon I based AceNICs' CONFIG_ACENIC_OMIT_TIGON_I
 	  fi
 	  tristate 'SysKonnect SK-98xx support' CONFIG_SK98LIN
+	  tristate 'Sun GEM support' CONFIG_SUNGEM
       fi
       tristate 'MyriCOM Gigabit Ethernet support' CONFIG_MYRI_SBUS
       endmenu
@@ -325,7 +330,11 @@
 dep_tristate '  Creator/Creator3D' CONFIG_DRM_FFB $CONFIG_DRM
 endmenu
 
+source drivers/input/Config.in
+
 source fs/Config.in
+
+source drivers/usb/Config.in
 
 mainmenu_option next_comment
 comment 'Watchdog'

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)