[kernel] r8710 - dists/trunk/linux-2.6/debian/arch

[Maximilian Attems]

Author: maks
Date: Tue May 22 13:30:55 2007
New Revision: 8710

Log:
group crypto options no functional change


Modified:
   dists/trunk/linux-2.6/debian/arch/config

Modified: dists/trunk/linux-2.6/debian/arch/config
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/config	(original)
+++ dists/trunk/linux-2.6/debian/arch/config	Tue May 22 13:30:55 2007
@@ -168,19 +168,53 @@
 CONFIG_PARTITION_ADVANCED=y
 CONFIG_MSDOS_PARTITION=y
 # CONFIG_PRINTK_TIME is not set
+
+#
+# Cryptographic options
+#
 CONFIG_CRYPTO=y
+CONFIG_CRYPTO_ALGAPI=y
+CONFIG_CRYPTO_BLKCIPHER=m
+CONFIG_CRYPTO_HASH=y
+CONFIG_CRYPTO_MANAGER=y
 CONFIG_CRYPTO_HMAC=y
+CONFIG_CRYPTO_XCBC=m
 CONFIG_CRYPTO_NULL=m
 CONFIG_CRYPTO_MD4=m
+CONFIG_CRYPTO_MD5=y
+CONFIG_CRYPTO_SHA1=m
 CONFIG_CRYPTO_SHA256=m
 CONFIG_CRYPTO_SHA512=m
+CONFIG_CRYPTO_WP512=m
+CONFIG_CRYPTO_TGR192=m
+CONFIG_CRYPTO_GF128MUL=m
+CONFIG_CRYPTO_ECB=m
+CONFIG_CRYPTO_CBC=m
+CONFIG_CRYPTO_LRW=m
+CONFIG_CRYPTO_DES=m
 CONFIG_CRYPTO_BLOWFISH=m
+CONFIG_CRYPTO_TWOFISH=m
+CONFIG_CRYPTO_TWOFISH_COMMON=m
 CONFIG_CRYPTO_SERPENT=m
+CONFIG_CRYPTO_AES=m
 CONFIG_CRYPTO_CAST5=m
 CONFIG_CRYPTO_CAST6=m
+CONFIG_CRYPTO_TEA=m
 CONFIG_CRYPTO_ARC4=m
+CONFIG_CRYPTO_KHAZAD=m
+CONFIG_CRYPTO_ANUBIS=m
 CONFIG_CRYPTO_DEFLATE=m
+CONFIG_CRYPTO_MICHAEL_MIC=m
 CONFIG_CRYPTO_CRC32C=m
+CONFIG_CRYPTO_TEST=m
+
+#
+# Hardware crypto devices
+#
+CONFIG_CRYPTO_DEV_PADLOCK=m
+CONFIG_CRYPTO_DEV_PADLOCK_SHA=m
+CONFIG_CRYPTO_DEV_PADLOCK_AES=m
+
 CONFIG_LIBCRC32C=m
 CONFIG_ZLIB_INFLATE=y
 CONFIG_ZLIB_DEFLATE=m
@@ -279,18 +313,6 @@
 CONFIG_TCG_INFINEON=m
 CONFIG_DVB_USB_NOVA_T_USB2=m
 # CONFIG_DVB_USB_DEBUG is not set
-CONFIG_CRYPTO_MD5=y
-CONFIG_CRYPTO_SHA1=m
-CONFIG_CRYPTO_WP512=m
-CONFIG_CRYPTO_TGR192=m
-CONFIG_CRYPTO_DES=m
-CONFIG_CRYPTO_KHAZAD=m
-CONFIG_CRYPTO_ANUBIS=m
-CONFIG_CRYPTO_MICHAEL_MIC=m
-CONFIG_CRYPTO_TEST=m
-CONFIG_CRYPTO_DEV_PADLOCK=m
-CONFIG_CRYPTO_TEA=m
-CONFIG_CRYPTO_AES=m
 CONFIG_REISERFS_FS=m
 # CONFIG_REISERFS_CHECK is not set
 # CONFIG_REISERFS_PROC_INFO is not set
@@ -835,7 +857,6 @@
 # CONFIG_FORCED_INLINING is not set
 CONFIG_USB_ET61X251=m
 # CONFIG_HOSTAP_FIRMWARE_NVRAM is not set
-CONFIG_CRYPTO_TWOFISH=m
 CONFIG_EXT2_FS_POSIX_ACL=y
 CONFIG_EXT2_FS_SECURITY=y
 CONFIG_EXT2_FS_XATTR=y
@@ -1143,7 +1164,6 @@
 CONFIG_SATA_VIA=m
 CONFIG_SATA_VITESSE=m
 CONFIG_SATA_INIC162X=m
-CONFIG_CRYPTO_BLKCIPHER=m
 CONFIG_MICROCODE_OLD_INTERFACE=y
 CONFIG_PCNET32_NAPI=y
 # CONFIG_PM_SYSFS_DEPRECATED is not set
@@ -1167,7 +1187,6 @@
 # CONFIG_INFINIBAND_AMSO1100_DEBUG is not set
 CONFIG_SYSCTL_SYSCALL=y
 # CONFIG_DEBUG_LIST is not set
-CONFIG_CRYPTO_MANAGER=y
 CONFIG_KEYBOARD_STOWAWAY=m
 CONFIG_EXT4DEV_FS_POSIX_ACL=y
 CONFIG_USB_U132_HCD=m
@@ -1199,14 +1218,11 @@
 # CONFIG_IPC_NS is not set
 # CONFIG_DEFAULT_VEGAS is not set
 CONFIG_USB_ADUTUX=m
-CONFIG_CRYPTO_HASH=y
-CONFIG_CRYPTO_ECB=m
 CONFIG_SND_AC97_POWER_SAVE=y
 CONFIG_PATA_WINBOND=m
 CONFIG_JBD2=m
 CONFIG_SSFDC=m
 CONFIG_DEFAULT_BIC=y
-CONFIG_CRYPTO_CBC=m
 CONFIG_TOUCHSCREEN_PENMOUNT=m
 CONFIG_VIDEO_TDA9840=m
 CONFIG_GFS2_FS_LOCKING_NOLOCK=m
@@ -1222,12 +1238,10 @@
 CONFIG_USB_PHIDGETMOTORCONTROL=m
 CONFIG_GFS2_FS_LOCKING_DLM=m
 CONFIG_FIB_RULES=y
-CONFIG_CRYPTO_TWOFISH_COMMON=m
 CONFIG_ZONE_DMA32=y
 CONFIG_TIFM_7XX1=m
 CONFIG_DVB_TDA826X=m
 CONFIG_VIDEO_PVRUSB2_29XXX=y
-CONFIG_CRYPTO_ALGAPI=y
 CONFIG_NET_PKTGEN=m
 CONFIG_VIDEO_VPX3220=m
 CONFIG_PROC_SYSCTL=y
@@ -1269,12 +1283,10 @@
 CONFIG_HOTPLUG_PCI_CPCI_ZT5550=m
 CONFIG_HOTPLUG_PCI_CPCI_GENERIC=m
 CONFIG_HOTPLUG_PCI_CPCI=y
-CONFIG_CRYPTO_DEV_PADLOCK_SHA=m
 CONFIG_PATA_LEGACY=m
 CONFIG_AUDIT_GENERIC=y
 CONFIG_PATA_QDI=m
 CONFIG_PATA_ISAPNP=m
-CONFIG_CRYPTO_DEV_PADLOCK_AES=m
 CONFIG_HDLC_RAW_ETH=m
 CONFIG_HDLC_X25=m
 CONFIG_HDLC_PPP=m
@@ -1282,7 +1294,6 @@
 CONFIG_HDLC_FR=m
 CONFIG_NF_CONNTRACK_EVENTS=y
 CONFIG_NF_CONNTRACK=m
-CONFIG_CRYPTO_LRW=m
 CONFIG_VIDEO_USBVISION=m
 CONFIG_NET_SCH_FIFO=y
 CONFIG_NETXEN_NIC=m
@@ -1291,7 +1302,6 @@
 CONFIG_PC87413_WDT=m
 CONFIG_NF_NAT_TFTP=m
 CONFIG_NF_NAT_NEEDED=y
-CONFIG_CRYPTO_GF128MUL=m
 CONFIG_NF_NAT_IRC=m
 CONFIG_IP_DCCP_CCID3_RTO=100
 CONFIG_MTD_BLKDEVS=m
@@ -1322,7 +1332,6 @@
 CONFIG_NF_CONNTRACK_IPV4=m
 # CONFIG_TCP_MD5SIG is not set
 CONFIG_NF_CONNTRACK_IPV6=m
-CONFIG_CRYPTO_XCBC=m
 CONFIG_MOXA_SMARTIO_NEW=m
 CONFIG_NF_CT_ACCT=y
 # CONFIG_ATA_NONSTANDARD is not set