Update of /cvsroot/linux-mips/linux/arch/mips
In directory usw-pr-cvs1:/tmp/cvs-serv13548/arch/mips
Modified Files:
Makefile defconfig
Log Message:
Sync to 2.4.7
Index: Makefile
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/Makefile,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** Makefile 2001/08/23 19:13:56 1.13
--- Makefile 2001/08/25 02:19:27 1.14
***************
*** 58,62 ****
endif
ifdef CONFIG_CPU_VR41XX
! GCCFLAGS += -mcpu=r4600 -mips2 -Wa,-m4100,--trap
endif
ifdef CONFIG_CPU_R4X00
--- 58,62 ----
endif
ifdef CONFIG_CPU_VR41XX
! GCCFLAGS += -mcpu=r4600 -mips2 -Wa,--trap
endif
ifdef CONFIG_CPU_R4X00
***************
*** 76,79 ****
--- 76,80 ----
endif
ifdef CONFIG_CPU_NEVADA
+ # Cannot use -mmad with currently recommended tools
GCCFLAGS += -mcpu=r5000 -mips2 -Wa,--trap
endif
Index: defconfig
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/defconfig,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** defconfig 2001/08/22 16:23:37 1.5
--- defconfig 2001/08/25 02:19:27 1.6
***************
*** 288,291 ****
--- 288,292 ----
# CONFIG_ACENIC is not set
# CONFIG_ACENIC_OMIT_TIGON_I is not set
+ # CONFIG_DL2K is not set
# CONFIG_MYRI_SBUS is not set
# CONFIG_HAMACHI is not set
***************
*** 378,381 ****
--- 379,383 ----
# CONFIG_R3964 is not set
# CONFIG_APPLICOM is not set
+ # CONFIG_SONYPI is not set
#
|
