- sync config with kernel 2.2.19 & patches

Changed files:
    kernel-sparc-smp.config -> 1.13
    kernel-sparc.config -> 1.12

diff --git a/kernel-sparc-smp.config b/kernel-sparc-smp.config
index 7414f9be9d36f97b3f9a39867c88a3a8140c61ba..0276f80bf87df24af2b7deeed7471d27310baf2e 100644 (file)
--- a/kernel-sparc-smp.config
+++ b/kernel-sparc-smp.config
@@ -1,5 +1,5 @@
 #
-# Automatically generated by make menuconfig: don't edit
+# Automatically generated make config: don't edit
 #
 
 #
@@ -19,6 +19,7 @@ CONFIG_KMOD=y
 #
 CONFIG_VT=y
 CONFIG_VT_CONSOLE=y
+CONFIG_SPARC32=y
 # CONFIG_AP1000 is not set
 CONFIG_SMP=y
 # CONFIG_SUN4 is not set
@@ -54,15 +55,23 @@ CONFIG_SUN_KEYBOARD=y
 CONFIG_SUN_CONSOLE=y
 CONFIG_SUN_AUXIO=y
 CONFIG_SUN_IO=y
+
+#
+# Misc Linux/SPARC drivers
+#
 CONFIG_SUN_OPENPROMIO=m
 CONFIG_SUN_MOSTEK_RTC=y
 CONFIG_SUN_BPP=m
 # CONFIG_SUN_VIDEOPIX is not set
 # CONFIG_SUN_AURORA is not set
+
+#
+# Linux/SPARC audio subsystem (EXPERIMENTAL)
+#
 CONFIG_SPARCAUDIO=m
 CONFIG_SPARCAUDIO_AMD7930=m
-CONFIG_SPARCAUDIO_CS4231=m
 CONFIG_SPARCAUDIO_DBRI=m
+CONFIG_SPARCAUDIO_CS4231=m
 CONFIG_SPARCAUDIO_DUMMY=m
 CONFIG_SUN_OPENPROMFS=m
 CONFIG_NET=y
@@ -122,11 +131,28 @@ CONFIG_NETLINK_DEV=y
 CONFIG_IP_ROUTE_FWMARK=y
 CONFIG_IP_TRANSPARENT_PROXY=y
 CONFIG_IP_MASQUERADE=y
+
+#
+# Protocol-specific masquerading support will be built as modules.
+#
 CONFIG_IP_MASQUERADE_ICMP=y
+
+#
+# Protocol-specific masquerading support will be built as modules.
+#
 CONFIG_IP_MASQUERADE_MOD=y
 CONFIG_IP_MASQUERADE_IPAUTOFW=m
 CONFIG_IP_MASQUERADE_IPPORTFW=m
 CONFIG_IP_MASQUERADE_MFW=m
+CONFIG_IP_MASQUERADE_VS=y
+CONFIG_IP_VS_DEBUG=y
+CONFIG_IP_MASQUERADE_VS_TAB_BITS=12
+CONFIG_IP_MASQUERADE_VS_RR=m
+CONFIG_IP_MASQUERADE_VS_WRR=m
+CONFIG_IP_MASQUERADE_VS_LC=m
+CONFIG_IP_MASQUERADE_VS_WLC=m
+CONFIG_IP_MASQUERADE_VS_LBLC=m
+CONFIG_IP_MASQUERADE_VS_LBLCR=m
 # CONFIG_IP_ROUTER is not set
 CONFIG_NET_IPIP=m
 CONFIG_NET_IPGRE=m
@@ -137,6 +163,10 @@ CONFIG_IP_PIMSM_V2=y
 CONFIG_IP_ALIAS=y
 # CONFIG_ARPD is not set
 CONFIG_SYN_COOKIES=y
+
+#
+# (it is safe to leave these untouched)
+#
 CONFIG_INET_RARP=m
 CONFIG_SKB_LARGE=y
 CONFIG_IPV6=m
@@ -148,13 +178,18 @@ CONFIG_ATM_CLIP=y
 CONFIG_ATM_CLIP_NO_ICMP=y
 CONFIG_ATM_LANE=m
 CONFIG_ATM_MPOA=m
+
+#
+#  
+#
 CONFIG_IPX=m
 # CONFIG_IPX_INTERN is not set
 CONFIG_SPX=m
 CONFIG_ATALK=m
+CONFIG_BRIDGE=m
 # CONFIG_X25 is not set
 # CONFIG_LAPB is not set
-CONFIG_BRIDGE=m
+# CONFIG_NET_DIVERT is not set
 # CONFIG_LLC is not set
 CONFIG_VLAN_802_1Q=y
 # CONFIG_ECONET is not set
@@ -188,15 +223,18 @@ CONFIG_NET_CLS_RSVP=m
 CONFIG_NET_CLS_RSVP6=m
 CONFIG_NET_CLS_POLICE=y
 CONFIG_IPSEC=m
+
+#
+# IPSec options (FreeS/WAN)
+#
 CONFIG_IPSEC_IPIP=y
-CONFIG_IPSEC_ICMP=y
-# CONFIG_IPSEC_NO_EROUTE_PASS is not set
 CONFIG_IPSEC_AH=y
 CONFIG_IPSEC_AUTH_HMAC_MD5=y
 CONFIG_IPSEC_AUTH_HMAC_SHA1=y
 CONFIG_IPSEC_ESP=y
 CONFIG_IPSEC_ENC_3DES=y
-DEBUG_IPSEC=y
+CONFIG_IPSEC_IPCOMP=y
+CONFIG_IPSEC_DEBUG=y
 
 #
 # Amateur Radio support
@@ -206,15 +244,32 @@ DEBUG_IPSEC=y
 #
 # Crypto options
 #
+CONFIG_CRYPTO=m
 CONFIG_CIPHERS=m
-CONFIG_CIPHER_BLOWFISH=m
-CONFIG_CIPHER_DES=m
-CONFIG_CIPHER_DFC=m
-CONFIG_CIPHER_IDEA=m
+CONFIG_CIPHER_AES=m
+CONFIG_CIPHER_RIJNDAEL=y
+
+#
+# AES Finalist Ciphers (128 bit blocksize)
+#
+CONFIG_CIPHER_TWOFISH=m
 CONFIG_CIPHER_MARS=m
-CONFIG_CIPHER_RC5=m
 CONFIG_CIPHER_RC6=m
 CONFIG_CIPHER_SERPENT=m
+
+#
+# Other Ciphers submitted as AES Candidates:
+#
+CONFIG_CIPHER_DFC=m
+
+#
+# Other ciphers (64 bit blocksize)
+#
+CONFIG_CIPHER_BLOWFISH=m
+CONFIG_CIPHER_IDEA=m
+CONFIG_CIPHER_RC5=m
+CONFIG_CIPHER_DES_EDE3=m
+CONFIG_CIPHER_DES=m
 CONFIG_DIGEST=m
 # CONFIG_DIGEST_MD5 is not set
 CONFIG_DIGEST_SHA1=m
@@ -228,11 +283,19 @@ CONFIG_DIGEST_SHA1=m
 # SCSI support
 #
 CONFIG_SCSI=y
+
+#
+# SCSI support type (disk, tape, CDrom)
+#
 CONFIG_BLK_DEV_SD=y
 CONFIG_CHR_DEV_ST=m
 CONFIG_BLK_DEV_SR=m
 CONFIG_BLK_DEV_SR_VENDOR=y
 CONFIG_CHR_DEV_SG=m
+
+#
+# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
+#
 # CONFIG_SCSI_MULTI_LUN is not set
 CONFIG_SCSI_CONSTANTS=y
 
@@ -246,8 +309,16 @@ CONFIG_SCSI_QLOGICPTI=m
 # Fibre Channel support
 #
 CONFIG_FC4=m
+
+#
+# FC4 drivers
+#
 CONFIG_FC4_SOC=m
 CONFIG_FC4_SOCAL=m
+
+#
+# FC4 targets
+#
 CONFIG_SCSI_PLUTO=m
 CONFIG_SCSI_FCAL=m
 
@@ -258,6 +329,10 @@ CONFIG_NETDEVICES=y
 CONFIG_DUMMY=m
 # CONFIG_BONDING is not set
 CONFIG_PPP=m
+
+#
+# CCP compressors for PPP are only built as modules.
+#
 CONFIG_SLIP=m
 CONFIG_SLIP_COMPRESSED=y
 CONFIG_SLIP_SMART=y
@@ -267,6 +342,10 @@ CONFIG_HAPPYMEAL=m
 CONFIG_SUNBMAC=m
 CONFIG_SUNQE=m
 CONFIG_MYRI_SBUS=m
+
+#
+# ATM drivers
+#
 CONFIG_ATM_TCP=m
 CONFIG_ATM_FORE200E=m
 CONFIG_ATM_FORE200E_SBA=y
@@ -285,6 +364,7 @@ CONFIG_UNIX98_PTY_COUNT=256
 #
 CONFIG_QUOTA=y
 CONFIG_AUTOFS_FS=m
+# CONFIG_REISERFS_FS is not set
 # CONFIG_ADFS_FS is not set
 CONFIG_AFFS_FS=m
 CONFIG_HFS_FS=m
@@ -302,14 +382,15 @@ CONFIG_HPFS_FS=m
 CONFIG_PROC_FS=y
 CONFIG_DEVPTS_FS=y
 # CONFIG_QNX4FS_FS is not set
+CONFIG_BEOS_FS=m
+CONFIG_BEOS_CONV=y
 CONFIG_ROMFS_FS=m
 CONFIG_EXT2_FS=y
 CONFIG_SYSV_FS=m
 CONFIG_UFS_FS=m
 CONFIG_UFS_FS_WRITE=y
-# CONFIG_REISERFS_FS is not set
-# CONFIG_REISERFS_CHECK is not set
 # CONFIG_EFS_FS is not set
+CONFIG_JFS_FS=m
 
 #
 # Network File Systems
@@ -319,9 +400,12 @@ CONFIG_NFS_FS=m
 CONFIG_NFS_V3=y
 CONFIG_NFSD=m
 CONFIG_NFSD_V3=y
+CONFIG_NFSD_TCP=y
 CONFIG_SUNRPC=m
 CONFIG_LOCKD=m
 CONFIG_SMB_FS=m
+CONFIG_SMB_NLS_DEFAULT=y
+CONFIG_SMB_NLS_REMOTE="cp437"
 CONFIG_NCP_FS=m
 CONFIG_NCPFS_PACKET_SIGNING=y
 CONFIG_NCPFS_IOCTL_LOCKING=y
@@ -338,6 +422,7 @@ CONFIG_NCPFS_EXTRAS=y
 #
 CONFIG_BSD_DISKLABEL=y
 CONFIG_MAC_PARTITION=y
+CONFIG_MINIX_SUBPARTITION=y
 CONFIG_SMD_DISKLABEL=y
 CONFIG_SOLARIS_X86_PARTITION=y
 CONFIG_UNIXWARE_DISKLABEL=y
@@ -380,6 +465,7 @@ CONFIG_NLS_ISO8859_9=m
 CONFIG_NLS_ISO8859_14=m
 CONFIG_NLS_ISO8859_15=m
 CONFIG_NLS_KOI8_R=m
+CONFIG_NLS_KOI8_RU=m
 
 #
 # Watchdog

diff --git a/kernel-sparc.config b/kernel-sparc.config
index 94c73c7e418c519adde920f7efba80a199a413e8..0405802c7c6912633ed29673be844781ae6bcc40 100644 (file)
--- a/kernel-sparc.config
+++ b/kernel-sparc.config
@@ -1,5 +1,5 @@
 #
-# Automatically generated by make menuconfig: don't edit
+# Automatically generated make config: don't edit
 #
 
 #
@@ -19,6 +19,7 @@ CONFIG_KMOD=y
 #
 CONFIG_VT=y
 CONFIG_VT_CONSOLE=y
+CONFIG_SPARC32=y
 # CONFIG_AP1000 is not set
 # CONFIG_SMP is not set
 # CONFIG_SUN4 is not set
@@ -54,15 +55,23 @@ CONFIG_SUN_KEYBOARD=y
 CONFIG_SUN_CONSOLE=y
 CONFIG_SUN_AUXIO=y
 CONFIG_SUN_IO=y
+
+#
+# Misc Linux/SPARC drivers
+#
 CONFIG_SUN_OPENPROMIO=m
 CONFIG_SUN_MOSTEK_RTC=y
 CONFIG_SUN_BPP=m
 # CONFIG_SUN_VIDEOPIX is not set
 # CONFIG_SUN_AURORA is not set
+
+#
+# Linux/SPARC audio subsystem (EXPERIMENTAL)
+#
 CONFIG_SPARCAUDIO=m
 CONFIG_SPARCAUDIO_AMD7930=m
-CONFIG_SPARCAUDIO_CS4231=m
 CONFIG_SPARCAUDIO_DBRI=m
+CONFIG_SPARCAUDIO_CS4231=m
 CONFIG_SPARCAUDIO_DUMMY=m
 CONFIG_SUN_OPENPROMFS=m
 CONFIG_NET=y
@@ -122,11 +131,28 @@ CONFIG_NETLINK_DEV=y
 CONFIG_IP_ROUTE_FWMARK=y
 CONFIG_IP_TRANSPARENT_PROXY=y
 CONFIG_IP_MASQUERADE=y
+
+#
+# Protocol-specific masquerading support will be built as modules.
+#
 CONFIG_IP_MASQUERADE_ICMP=y
+
+#
+# Protocol-specific masquerading support will be built as modules.
+#
 CONFIG_IP_MASQUERADE_MOD=y
 CONFIG_IP_MASQUERADE_IPAUTOFW=m
 CONFIG_IP_MASQUERADE_IPPORTFW=m
 CONFIG_IP_MASQUERADE_MFW=m
+CONFIG_IP_MASQUERADE_VS=y
+CONFIG_IP_VS_DEBUG=y
+CONFIG_IP_MASQUERADE_VS_TAB_BITS=12
+CONFIG_IP_MASQUERADE_VS_RR=m
+CONFIG_IP_MASQUERADE_VS_WRR=m
+CONFIG_IP_MASQUERADE_VS_LC=m
+CONFIG_IP_MASQUERADE_VS_WLC=m
+CONFIG_IP_MASQUERADE_VS_LBLC=m
+CONFIG_IP_MASQUERADE_VS_LBLCR=m
 # CONFIG_IP_ROUTER is not set
 CONFIG_NET_IPIP=m
 CONFIG_NET_IPGRE=m
@@ -137,6 +163,10 @@ CONFIG_IP_PIMSM_V2=y
 CONFIG_IP_ALIAS=y
 # CONFIG_ARPD is not set
 CONFIG_SYN_COOKIES=y
+
+#
+# (it is safe to leave these untouched)
+#
 CONFIG_INET_RARP=m
 CONFIG_SKB_LARGE=y
 CONFIG_IPV6=m
@@ -148,13 +178,18 @@ CONFIG_ATM_CLIP=y
 CONFIG_ATM_CLIP_NO_ICMP=y
 CONFIG_ATM_LANE=m
 CONFIG_ATM_MPOA=m
+
+#
+#  
+#
 CONFIG_IPX=m
 # CONFIG_IPX_INTERN is not set
 CONFIG_SPX=m
 CONFIG_ATALK=m
+CONFIG_BRIDGE=m
 # CONFIG_X25 is not set
 # CONFIG_LAPB is not set
-CONFIG_BRIDGE=m
+# CONFIG_NET_DIVERT is not set
 # CONFIG_LLC is not set
 CONFIG_VLAN_802_1Q=y
 # CONFIG_ECONET is not set
@@ -188,15 +223,18 @@ CONFIG_NET_CLS_RSVP=m
 CONFIG_NET_CLS_RSVP6=m
 CONFIG_NET_CLS_POLICE=y
 CONFIG_IPSEC=m
+
+#
+# IPSec options (FreeS/WAN)
+#
 CONFIG_IPSEC_IPIP=y
-CONFIG_IPSEC_ICMP=y
-# CONFIG_IPSEC_NO_EROUTE_PASS is not set
 CONFIG_IPSEC_AH=y
 CONFIG_IPSEC_AUTH_HMAC_MD5=y
 CONFIG_IPSEC_AUTH_HMAC_SHA1=y
 CONFIG_IPSEC_ESP=y
 CONFIG_IPSEC_ENC_3DES=y
-DEBUG_IPSEC=y
+CONFIG_IPSEC_IPCOMP=y
+CONFIG_IPSEC_DEBUG=y
 
 #
 # Amateur Radio support
@@ -206,15 +244,32 @@ DEBUG_IPSEC=y
 #
 # Crypto options
 #
+CONFIG_CRYPTO=m
 CONFIG_CIPHERS=m
-CONFIG_CIPHER_BLOWFISH=m
-CONFIG_CIPHER_DES=m
-CONFIG_CIPHER_DFC=m
-CONFIG_CIPHER_IDEA=m
+CONFIG_CIPHER_AES=m
+CONFIG_CIPHER_RIJNDAEL=y
+
+#
+# AES Finalist Ciphers (128 bit blocksize)
+#
+CONFIG_CIPHER_TWOFISH=m
 CONFIG_CIPHER_MARS=m
-CONFIG_CIPHER_RC5=m
 CONFIG_CIPHER_RC6=m
 CONFIG_CIPHER_SERPENT=m
+
+#
+# Other Ciphers submitted as AES Candidates:
+#
+CONFIG_CIPHER_DFC=m
+
+#
+# Other ciphers (64 bit blocksize)
+#
+CONFIG_CIPHER_BLOWFISH=m
+CONFIG_CIPHER_IDEA=m
+CONFIG_CIPHER_RC5=m
+CONFIG_CIPHER_DES_EDE3=m
+CONFIG_CIPHER_DES=m
 CONFIG_DIGEST=m
 # CONFIG_DIGEST_MD5 is not set
 CONFIG_DIGEST_SHA1=m
@@ -228,11 +283,19 @@ CONFIG_DIGEST_SHA1=m
 # SCSI support
 #
 CONFIG_SCSI=y
+
+#
+# SCSI support type (disk, tape, CDrom)
+#
 CONFIG_BLK_DEV_SD=y
 CONFIG_CHR_DEV_ST=m
 CONFIG_BLK_DEV_SR=m
 CONFIG_BLK_DEV_SR_VENDOR=y
 CONFIG_CHR_DEV_SG=m
+
+#
+# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
+#
 # CONFIG_SCSI_MULTI_LUN is not set
 CONFIG_SCSI_CONSTANTS=y
 
@@ -246,8 +309,16 @@ CONFIG_SCSI_QLOGICPTI=m
 # Fibre Channel support
 #
 CONFIG_FC4=m
+
+#
+# FC4 drivers
+#
 CONFIG_FC4_SOC=m
 CONFIG_FC4_SOCAL=m
+
+#
+# FC4 targets
+#
 CONFIG_SCSI_PLUTO=m
 CONFIG_SCSI_FCAL=m
 
@@ -258,6 +329,10 @@ CONFIG_NETDEVICES=y
 CONFIG_DUMMY=m
 # CONFIG_BONDING is not set
 CONFIG_PPP=m
+
+#
+# CCP compressors for PPP are only built as modules.
+#
 CONFIG_SLIP=m
 CONFIG_SLIP_COMPRESSED=y
 CONFIG_SLIP_SMART=y
@@ -267,6 +342,10 @@ CONFIG_HAPPYMEAL=m
 CONFIG_SUNBMAC=m
 CONFIG_SUNQE=m
 CONFIG_MYRI_SBUS=m
+
+#
+# ATM drivers
+#
 CONFIG_ATM_TCP=m
 CONFIG_ATM_FORE200E=m
 CONFIG_ATM_FORE200E_SBA=y
@@ -285,6 +364,7 @@ CONFIG_UNIX98_PTY_COUNT=256
 #
 CONFIG_QUOTA=y
 CONFIG_AUTOFS_FS=m
+# CONFIG_REISERFS_FS is not set
 # CONFIG_ADFS_FS is not set
 CONFIG_AFFS_FS=m
 CONFIG_HFS_FS=m
@@ -294,20 +374,23 @@ CONFIG_UMSDOS_FS=m
 CONFIG_VFAT_FS=m
 CONFIG_ISO9660_FS=y
 CONFIG_JOLIET=y
+CONFIG_UDF_FS=m
+# CONFIG_UDF_RW is not set
 CONFIG_MINIX_FS=m
 # CONFIG_NTFS_FS is not set
 CONFIG_HPFS_FS=m
 CONFIG_PROC_FS=y
 CONFIG_DEVPTS_FS=y
 # CONFIG_QNX4FS_FS is not set
+CONFIG_BEOS_FS=m
+CONFIG_BEOS_CONV=y
 CONFIG_ROMFS_FS=m
 CONFIG_EXT2_FS=y
 CONFIG_SYSV_FS=m
 CONFIG_UFS_FS=m
 CONFIG_UFS_FS_WRITE=y
-# CONFIG_REISERFS_FS is not set
-# CONFIG_REISERFS_CHECK is not set
 # CONFIG_EFS_FS is not set
+CONFIG_JFS_FS=m
 
 #
 # Network File Systems
@@ -317,9 +400,12 @@ CONFIG_NFS_FS=m
 CONFIG_NFS_V3=y
 CONFIG_NFSD=m
 CONFIG_NFSD_V3=y
+CONFIG_NFSD_TCP=y
 CONFIG_SUNRPC=m
 CONFIG_LOCKD=m
 CONFIG_SMB_FS=m
+CONFIG_SMB_NLS_DEFAULT=y
+CONFIG_SMB_NLS_REMOTE="cp437"
 CONFIG_NCP_FS=m
 CONFIG_NCPFS_PACKET_SIGNING=y
 CONFIG_NCPFS_IOCTL_LOCKING=y
@@ -336,6 +422,7 @@ CONFIG_NCPFS_EXTRAS=y
 #
 CONFIG_BSD_DISKLABEL=y
 CONFIG_MAC_PARTITION=y
+CONFIG_MINIX_SUBPARTITION=y
 CONFIG_SMD_DISKLABEL=y
 CONFIG_SOLARIS_X86_PARTITION=y
 CONFIG_UNIXWARE_DISKLABEL=y
@@ -378,6 +465,7 @@ CONFIG_NLS_ISO8859_9=m
 CONFIG_NLS_ISO8859_14=m
 CONFIG_NLS_ISO8859_15=m
 CONFIG_NLS_KOI8_R=m
+CONFIG_NLS_KOI8_RU=m
 
 #
 # Watchdog