From 422791af5232f9732934435811ea67fac6f62b42 Mon Sep 17 00:00:00 2001
From: Maximilian Attems <maks@debian.org>
Date: Sat, 26 Jan 2008 11:33:07 +0000
Subject: [PATCH] topconfig, amd64: enable new crypto modules

topconfig set NOZOMI, CRYPTO_SEQIV, CRYPTO_CTR, CRYPTO_GCM, CRYPTO_CCM,
CRYPTO_SALSA20, CRYPTO_LZO, CRYPTO_DEV_HIFN_795X.
[amd64] Enable CRYPTO_SALSA20_X86_64.

svn path=/dists/trunk/linux-2.6/; revision=10209
---
 debian/changelog           | 4 +++-
 debian/config/amd64/config | 1 +
 debian/config/config       | 7 +++++++
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 57915e0f7..4e846b680 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,7 +3,9 @@ linux-2.6 (2.6.24-1~experimental.2) UNRELEASED; urgency=low
   * New upstream release
 
   [ maximilian attems ]
-  * topconfig set NOZOMI.
+  * topconfig set NOZOMI, CRYPTO_SEQIV, CRYPTO_CTR, CRYPTO_GCM, CRYPTO_CCM,
+    CRYPTO_SALSA20, CRYPTO_LZO, CRYPTO_DEV_HIFN_795X.
+  * [amd64] Enable CRYPTO_SALSA20_X86_64.
 
  -- maximilian attems <maks@debian.org>  Sat, 26 Jan 2008 11:54:31 +0100
 
diff --git a/debian/config/amd64/config b/debian/config/amd64/config
index 51a0e5ad4..583ed34cc 100644
--- a/debian/config/amd64/config
+++ b/debian/config/amd64/config
@@ -1318,3 +1318,4 @@ CONFIG_SUSPEND_SMP_POSSIBLE=y
 CONFIG_BLK_DEV_IDEACPI=y
 # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
 CONFIG_NETDEVICES_MULTIQUEUE=y
+CONFIG_CRYPTO_SALSA20_X86_64=m
diff --git a/debian/config/config b/debian/config/config
index 5005418f3..2ea912b98 100644
--- a/debian/config/config
+++ b/debian/config/config
@@ -1184,6 +1184,7 @@ CONFIG_ASYNC_XOR=m
 CONFIG_CRYPTO=y
 CONFIG_CRYPTO_ALGAPI=y
 CONFIG_CRYPTO_BLKCIPHER=m
+CONFIG_CRYPTO_SEQIV=m
 CONFIG_CRYPTO_HASH=y
 CONFIG_CRYPTO_MANAGER=y
 CONFIG_CRYPTO_HMAC=y
@@ -1202,6 +1203,9 @@ CONFIG_CRYPTO_CBC=m
 CONFIG_CRYPTO_PCBC=m
 CONFIG_CRYPTO_LRW=m
 CONFIG_CRYPTO_XTS=m
+CONFIG_CRYPTO_CTR=m
+CONFIG_CRYPTO_GCM=m
+CONFIG_CRYPTO_CCM=m
 # CONFIG_CRYPTO_CRYPTD is not set
 CONFIG_CRYPTO_DES=m
 CONFIG_CRYPTO_FCRYPT=m
@@ -1217,13 +1221,16 @@ CONFIG_CRYPTO_ARC4=m
 CONFIG_CRYPTO_KHAZAD=m
 CONFIG_CRYPTO_ANUBIS=m
 CONFIG_CRYPTO_SEED=m
+CONFIG_CRYPTO_SALSA20=m
 CONFIG_CRYPTO_DEFLATE=m
 CONFIG_CRYPTO_MICHAEL_MIC=m
 CONFIG_CRYPTO_CRC32C=m
 CONFIG_CRYPTO_CAMELLIA=m
 CONFIG_CRYPTO_TEST=m
 CONFIG_CRYPTO_AUTHENC=m
+CONFIG_CRYPTO_LZO=m
 CONFIG_CRYPTO_HW=y
+CONFIG_CRYPTO_DEV_HIFN_795X=m
 
 #
 # Hardware crypto devices