- updated to 2.4.22

Changed files:
    kernel-sparc-smp.config -> 1.39
    kernel-sparc.config -> 1.38
    kernel-sparc64-smp.config -> 1.47
    kernel-sparc64.config -> 1.49

diff --git a/kernel-sparc-smp.config b/kernel-sparc-smp.config
index d4602749808965c6621f8f3362ea2f8fb842159a..b0cf2999e33fcdddf5ee25f245890a4bb6bad739 100644 (file)
--- a/kernel-sparc-smp.config
+++ b/kernel-sparc-smp.config
@@ -139,6 +139,7 @@ CONFIG_SPARCAUDIO_DUMMY=m
 #
 CONFIG_BLK_DEV_FD=y
 CONFIG_BLK_DEV_LOOP=m
+CONFIG_BLK_DEV_CRYPTOLOOP=m
 CONFIG_BLK_DEV_NBD=m
 
 #
@@ -193,6 +194,7 @@ CONFIG_IPV6=m
 CONFIG_KHTTPD=m
 CONFIG_ATM=m
 CONFIG_ATM_CLIP=m
+# CONFIG_ATM_CLIP_NO_ICMP is not set
 CONFIG_ATM_LANE=m
 CONFIG_ATM_MPOA=m
 CONFIG_ATM_BR2684=m
@@ -269,6 +271,7 @@ CONFIG_NET_PKTGEN=m
 CONFIG_ISDN=m
 CONFIG_ISDN_BOOL=y
 CONFIG_ISDN_PPP=y
+CONFIG_IPPP_FILTER=y
 CONFIG_ISDN_PPP_VJ=y
 CONFIG_ISDN_MPP=y
 CONFIG_ISDN_PPP_BSDCOMP=m
@@ -458,6 +461,7 @@ CONFIG_CODA_FS=m
 CONFIG_INTERMEZZO_FS=m
 CONFIG_NFS_FS=m
 CONFIG_NFS_V3=y
+CONFIG_NFS_DIRECTIO=y
 # CONFIG_ROOT_NFS is not set
 CONFIG_NFSD=m
 CONFIG_NFSD_V3=y
@@ -559,6 +563,7 @@ CONFIG_BLUEZ_RFCOMM_TTY=y
 CONFIG_BLUEZ_BNEP=m
 CONFIG_BLUEZ_BNEP_MC_FILTER=y
 CONFIG_BLUEZ_BNEP_PROTO_FILTER=y
+CONFIG_BLUEZ_CMTP=m
 
 #
 # Bluetooth device drivers
@@ -570,6 +575,7 @@ CONFIG_BLUEZ_HCIUART=m
 CONFIG_BLUEZ_HCIUART_H4=y
 CONFIG_BLUEZ_HCIUART_BCSP=y
 CONFIG_BLUEZ_HCIUART_BCSP_TXCRC=y
+CONFIG_BLUEZ_HCIBFUSB=m
 # CONFIG_BLUEZ_HCIDTL1 is not set
 # CONFIG_BLUEZ_HCIBT3C is not set
 # CONFIG_BLUEZ_HCIBLUECARD is not set
@@ -591,9 +597,29 @@ CONFIG_DEBUG_KERNEL=y
 CONFIG_MAGIC_SYSRQ=y
 # CONFIG_DEBUG_SPINLOCK is not set
 
+#
+# Cryptographic options
+#
+CONFIG_CRYPTO=y
+CONFIG_CRYPTO_HMAC=y
+CONFIG_CRYPTO_NULL=m
+CONFIG_CRYPTO_MD4=m
+CONFIG_CRYPTO_MD5=m
+CONFIG_CRYPTO_SHA1=m
+CONFIG_CRYPTO_SHA256=m
+CONFIG_CRYPTO_SHA512=m
+CONFIG_CRYPTO_DES=m
+CONFIG_CRYPTO_BLOWFISH=m
+CONFIG_CRYPTO_TWOFISH=m
+CONFIG_CRYPTO_SERPENT=m
+CONFIG_CRYPTO_AES=m
+CONFIG_CRYPTO_DEFLATE=m
+CONFIG_CRYPTO_TEST=m
+
 #
 # Library routines
 #
+CONFIG_CRC32=m
 CONFIG_ZLIB_INFLATE=y
 CONFIG_ZLIB_DEFLATE=m
 CONFIG_QSORT=y

diff --git a/kernel-sparc.config b/kernel-sparc.config
index e2e71903f4a16cf49bba7de4e898b2b5d3edbaf8..540122ffd25ade524c70c7d0c281f1380e01b6d5 100644 (file)
--- a/kernel-sparc.config
+++ b/kernel-sparc.config
@@ -139,6 +139,7 @@ CONFIG_SPARCAUDIO_DUMMY=m
 #
 CONFIG_BLK_DEV_FD=y
 CONFIG_BLK_DEV_LOOP=m
+CONFIG_BLK_DEV_CRYPTOLOOP=m
 CONFIG_BLK_DEV_NBD=m
 
 #
@@ -193,6 +194,7 @@ CONFIG_IPV6=m
 CONFIG_KHTTPD=m
 CONFIG_ATM=m
 CONFIG_ATM_CLIP=m
+# CONFIG_ATM_CLIP_NO_ICMP is not set
 CONFIG_ATM_LANE=m
 CONFIG_ATM_MPOA=m
 CONFIG_ATM_BR2684=m
@@ -269,6 +271,7 @@ CONFIG_NET_PKTGEN=m
 CONFIG_ISDN=m
 CONFIG_ISDN_BOOL=y
 CONFIG_ISDN_PPP=y
+CONFIG_IPPP_FILTER=y
 CONFIG_ISDN_PPP_VJ=y
 CONFIG_ISDN_MPP=y
 CONFIG_ISDN_PPP_BSDCOMP=m
@@ -458,6 +461,7 @@ CONFIG_CODA_FS=m
 CONFIG_INTERMEZZO_FS=m
 CONFIG_NFS_FS=m
 CONFIG_NFS_V3=y
+CONFIG_NFS_DIRECTIO=y
 # CONFIG_ROOT_NFS is not set
 CONFIG_NFSD=m
 CONFIG_NFSD_V3=y
@@ -559,6 +563,7 @@ CONFIG_BLUEZ_RFCOMM_TTY=y
 CONFIG_BLUEZ_BNEP=m
 CONFIG_BLUEZ_BNEP_MC_FILTER=y
 CONFIG_BLUEZ_BNEP_PROTO_FILTER=y
+CONFIG_BLUEZ_CMTP=m
 
 #
 # Bluetooth device drivers
@@ -570,6 +575,7 @@ CONFIG_BLUEZ_HCIUART=m
 CONFIG_BLUEZ_HCIUART_H4=y
 CONFIG_BLUEZ_HCIUART_BCSP=y
 CONFIG_BLUEZ_HCIUART_BCSP_TXCRC=y
+CONFIG_BLUEZ_HCIBFUSB=m
 # CONFIG_BLUEZ_HCIDTL1 is not set
 # CONFIG_BLUEZ_HCIBT3C is not set
 # CONFIG_BLUEZ_HCIBLUECARD is not set
@@ -591,9 +597,29 @@ CONFIG_DEBUG_KERNEL=y
 CONFIG_MAGIC_SYSRQ=y
 # CONFIG_DEBUG_SPINLOCK is not set
 
+#
+# Cryptographic options
+#
+CONFIG_CRYPTO=y
+CONFIG_CRYPTO_HMAC=y
+CONFIG_CRYPTO_NULL=m
+CONFIG_CRYPTO_MD4=m
+CONFIG_CRYPTO_MD5=m
+CONFIG_CRYPTO_SHA1=m
+CONFIG_CRYPTO_SHA256=m
+CONFIG_CRYPTO_SHA512=m
+CONFIG_CRYPTO_DES=m
+CONFIG_CRYPTO_BLOWFISH=m
+CONFIG_CRYPTO_TWOFISH=m
+CONFIG_CRYPTO_SERPENT=m
+CONFIG_CRYPTO_AES=m
+CONFIG_CRYPTO_DEFLATE=m
+CONFIG_CRYPTO_TEST=m
+
 #
 # Library routines
 #
+CONFIG_CRC32=m
 CONFIG_ZLIB_INFLATE=y
 CONFIG_ZLIB_DEFLATE=m
 CONFIG_QSORT=y

diff --git a/kernel-sparc64-smp.config b/kernel-sparc64-smp.config
index 14b2bb6543fe187cdd60793fc3ad6dee5d340c5d..2a2ab866373527d5927f295cf3cff7bc13f9325b 100644 (file)
--- a/kernel-sparc64-smp.config
+++ b/kernel-sparc64-smp.config
@@ -249,7 +249,11 @@ CONFIG_MTD_NAND_IDS=m
 #
 CONFIG_BLK_DEV_FD=y
 CONFIG_BLK_DEV_LOOP=m
+CONFIG_BLK_DEV_CRYPTOLOOP=m
 CONFIG_BLK_DEV_NBD=m
+CONFIG_BLK_DEV_RAM=y
+CONFIG_BLK_DEV_RAM_SIZE=4096
+CONFIG_BLK_DEV_INITRD=y
 
 #
 # Multi-device support (RAID and LVM)
@@ -265,43 +269,6 @@ CONFIG_BLK_DEV_LVM=m
 CONFIG_BLK_DEV_DM=m
 CONFIG_BLK_DEV_DM_MIRROR=m
 
-#
-# Cryptography support (CryptoAPI)
-#
-CONFIG_CRYPTO=m
-CONFIG_CIPHERS=y
-CONFIG_CIPHER_AES=m
-CONFIG_CIPHER_MARS=m
-CONFIG_CIPHER_RC6=m
-CONFIG_CIPHER_SERPENT=m
-CONFIG_CIPHER_TWOFISH=m
-CONFIG_CIPHER_3DES=m
-CONFIG_CIPHER_BLOWFISH=m
-CONFIG_CIPHER_CAST5=m
-CONFIG_CIPHER_GOST=m
-CONFIG_CIPHER_IDEA=m
-CONFIG_CIPHER_RC5=m
-CONFIG_CIPHER_NULL=m
-CONFIG_CIPHER_DES=m
-CONFIG_CIPHER_DFC=m
-CONFIG_CIPHER_BLOWFISH_OLD=m
-CONFIG_DIGESTS=y
-CONFIG_DIGEST_MD5=m
-CONFIG_DIGEST_SHA1=m
-CONFIG_DIGEST_RIPEMD160=m
-CONFIG_DIGEST_SHA256=m
-CONFIG_DIGEST_SHA384=m
-CONFIG_DIGEST_SHA512=m
-CONFIG_CRYPTODEV=y
-CONFIG_CRYPTOLOOP=m
-CONFIG_CRYPTOLOOP_ATOMIC=y
-# CONFIG_CRYPTOLOOP_IV_HACK is not set
-# CONFIG_CRYPTOLOOP_DEBUG is not set
-CONFIG_IPSEC_TUNNEL=m
-CONFIG_BLK_DEV_RAM=y
-CONFIG_BLK_DEV_RAM_SIZE=4096
-CONFIG_BLK_DEV_INITRD=y
-
 #
 # Networking options
 #
@@ -378,6 +345,7 @@ CONFIG_IP6_NF_IPTABLES=m
 CONFIG_KHTTPD=m
 CONFIG_ATM=m
 CONFIG_ATM_CLIP=m
+# CONFIG_ATM_CLIP_NO_ICMP is not set
 CONFIG_ATM_LANE=m
 CONFIG_ATM_MPOA=m
 CONFIG_ATM_BR2684=m

diff --git a/kernel-sparc64.config b/kernel-sparc64.config
index d8ef37ee67b1ad12c1e8d48e3c768edf312a9594..479cf867e283632541f0e0df425f06d44060e3e9 100644 (file)
--- a/kernel-sparc64.config
+++ b/kernel-sparc64.config
@@ -249,7 +249,11 @@ CONFIG_MTD_NAND_IDS=m
 #
 CONFIG_BLK_DEV_FD=y
 CONFIG_BLK_DEV_LOOP=m
+CONFIG_BLK_DEV_CRYPTOLOOP=m
 CONFIG_BLK_DEV_NBD=m
+CONFIG_BLK_DEV_RAM=y
+CONFIG_BLK_DEV_RAM_SIZE=4096
+CONFIG_BLK_DEV_INITRD=y
 
 #
 # Multi-device support (RAID and LVM)
@@ -265,43 +269,6 @@ CONFIG_BLK_DEV_LVM=m
 CONFIG_BLK_DEV_DM=m
 CONFIG_BLK_DEV_DM_MIRROR=m
 
-#
-# Cryptography support (CryptoAPI)
-#
-CONFIG_CRYPTO=m
-CONFIG_CIPHERS=y
-CONFIG_CIPHER_AES=m
-CONFIG_CIPHER_MARS=m
-CONFIG_CIPHER_RC6=m
-CONFIG_CIPHER_SERPENT=m
-CONFIG_CIPHER_TWOFISH=m
-CONFIG_CIPHER_3DES=m
-CONFIG_CIPHER_BLOWFISH=m
-CONFIG_CIPHER_CAST5=m
-CONFIG_CIPHER_GOST=m
-CONFIG_CIPHER_IDEA=m
-CONFIG_CIPHER_RC5=m
-CONFIG_CIPHER_NULL=m
-CONFIG_CIPHER_DES=m
-CONFIG_CIPHER_DFC=m
-CONFIG_CIPHER_BLOWFISH_OLD=m
-CONFIG_DIGESTS=y
-CONFIG_DIGEST_MD5=m
-CONFIG_DIGEST_SHA1=m
-CONFIG_DIGEST_RIPEMD160=m
-CONFIG_DIGEST_SHA256=m
-CONFIG_DIGEST_SHA384=m
-CONFIG_DIGEST_SHA512=m
-CONFIG_CRYPTODEV=y
-CONFIG_CRYPTOLOOP=m
-CONFIG_CRYPTOLOOP_ATOMIC=y
-# CONFIG_CRYPTOLOOP_IV_HACK is not set
-# CONFIG_CRYPTOLOOP_DEBUG is not set
-CONFIG_IPSEC_TUNNEL=m
-CONFIG_BLK_DEV_RAM=y
-CONFIG_BLK_DEV_RAM_SIZE=4096
-CONFIG_BLK_DEV_INITRD=y
-
 #
 # Networking options
 #
@@ -378,6 +345,7 @@ CONFIG_IP6_NF_IPTABLES=m
 CONFIG_KHTTPD=m
 CONFIG_ATM=m
 CONFIG_ATM_CLIP=m
+# CONFIG_ATM_CLIP_NO_ICMP is not set
 CONFIG_ATM_LANE=m
 CONFIG_ATM_MPOA=m
 CONFIG_ATM_BR2684=m