|
From: Roman Z. <zi...@us...> - 2001-07-08 17:00:27
|
Update of /cvsroot/linux-apus/2.3/arch/ppc/configs In directory usw-pr-cvs1:/tmp/cvs-serv11606/arch/ppc/configs Modified Files: apus_defconfig Log Message: conflict fixes from import bitkeeper (2.4.6) Index: apus_defconfig =================================================================== RCS file: /cvsroot/linux-apus/2.3/arch/ppc/configs/apus_defconfig,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- apus_defconfig 2001/06/10 00:17:27 1.7 +++ apus_defconfig 2001/07/08 16:59:54 1.8 @@ -28,8 +28,8 @@ # CONFIG_8xx is not set # CONFIG_8260 is not set # CONFIG_ALL_PPC is not set -# CONFIG_GEMINI is not set CONFIG_APUS=y +# CONFIG_GEMINI is not set # CONFIG_PPC601_SYNC_FIX is not set # CONFIG_SMP is not set # CONFIG_ALTIVEC is not set @@ -365,12 +365,12 @@ # CONFIG_EQUALIZER is not set CONFIG_TUN=m # CONFIG_ETHERTAP is not set -# CONFIG_NET_SB1000 is not set # # Ethernet (10 or 100Mbit) # CONFIG_NET_ETHERNET=y +# CONFIG_ARM_AM79C961A is not set # CONFIG_MACE is not set # CONFIG_BMAC is not set # CONFIG_GMAC is not set @@ -380,12 +380,16 @@ CONFIG_NE2K_ZORRO=y CONFIG_A2065=y CONFIG_HYDRA=y +# CONFIG_SUNLANCE is not set +# CONFIG_HAPPYMEAL 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_AT1700 is not set -# CONFIG_DEPCA is not set # CONFIG_HP100 is not set # CONFIG_NET_ISA is not set # CONFIG_NET_PCI is not set @@ -395,6 +399,8 @@ # Ethernet (1000 Mbit) # # 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 # CONFIG_SK98LIN is not set @@ -637,7 +643,6 @@ CONFIG_ROMFS_FS=y 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 # CONFIG_UFS_FS is not set @@ -749,6 +754,7 @@ # CONFIG_SOUND_MSNDCLAS is not set # CONFIG_SOUND_MSNDPIN is not set # CONFIG_SOUND_VIA82CXXX is not set +# CONFIG_MIDI_VIA82CXXX is not set CONFIG_SOUND_OSS=m CONFIG_SOUND_TRACEINIT=y CONFIG_SOUND_DMAP=y @@ -785,6 +791,11 @@ # USB support # # CONFIG_USB is not set + +# +# Bluetooth support +# +# CONFIG_BLUEZ is not set # # Kernel hacking |