[Linux-mips-commits] CVS: linux/arch/mips defconfig,1.4,1.5

[James S. <jsi...@us...>]

Update of /cvsroot/linux-mips/linux/arch/mips
In directory usw-pr-cvs1:/tmp/cvs-serv31361

Modified Files:
	defconfig 
Log Message:
Synced to Ralph's tree

Index: defconfig
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/defconfig,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** defconfig	2001/08/16 16:51:27	1.4
--- defconfig	2001/08/22 16:23:37	1.5
***************
*** 263,267 ****
  # CONFIG_TUN is not set
  # CONFIG_ETHERTAP is not set
- # CONFIG_NET_SB1000 is not set
  
  #
--- 263,266 ----
***************
*** 269,278 ****
  #
  CONFIG_NET_ETHERNET=y
  # CONFIG_NET_VENDOR_3COM is not set
  # CONFIG_LANCE is not set
  # CONFIG_NET_VENDOR_SMC is not set
  # CONFIG_NET_VENDOR_RACAL is not set
- # CONFIG_AT1700 is not set
- # CONFIG_DEPCA is not set
  # CONFIG_NET_ISA is not set
  # CONFIG_NET_PCI is not set
--- 268,281 ----
  #
  CONFIG_NET_ETHERNET=y
+ # CONFIG_ARM_AM79C961A is not set
+ # CONFIG_SUNLANCE is not set
+ # CONFIG_SUNBMAC is not set
+ # CONFIG_SUNQE is not set
+ # CONFIG_SUNLANCE is not set
+ # CONFIG_SUNGEM is not set
  # CONFIG_NET_VENDOR_3COM is not set
  # CONFIG_LANCE is not set
  # CONFIG_NET_VENDOR_SMC is not set
  # CONFIG_NET_VENDOR_RACAL is not set
  # CONFIG_NET_ISA is not set
  # CONFIG_NET_PCI is not set
***************
*** 284,287 ****
--- 287,292 ----
  #
  # CONFIG_ACENIC is not set
+ # CONFIG_ACENIC_OMIT_TIGON_I is not set
+ # CONFIG_MYRI_SBUS is not set
  # CONFIG_HAMACHI is not set
  # CONFIG_YELLOWFIN is not set
***************
*** 289,292 ****
--- 294,298 ----
  # CONFIG_FDDI is not set
  # CONFIG_HIPPI is not set
+ # CONFIG_PLIP is not set
  # CONFIG_PPP is not set
  # CONFIG_SLIP is not set
***************
*** 435,439 ****
  CONFIG_EXT2_FS=y
  # CONFIG_SYSV_FS is not set
- # CONFIG_SYSV_FS_WRITE is not set
  # CONFIG_UDF_FS is not set
  # CONFIG_UDF_RW is not set
--- 441,444 ----