Re: 2.6.22-rc4-mm1

From: Jan Engelhardt
Date: Thu Jun 07 2007 - 02:56:55 EST



On Jun 6 2007 16:42, Andrew Morton wrote:

>> If so then you sent to it me :)
>
>You merged it ;)
>
>> Should I drop it?
>
>Sure, Jan will fix it up, I assume. I might have broken it while repairing
>the reject storm which occurred when that durned HAS_IOMEM thing went in
>all over the tree.

/me points at Herbert
Andrew would not add options between the "menuconfig CRYPTO" and
the "if CRYPTO" line... :)


Jan


===

Unbreak the crypto menu breakage.

Signed-off-by: Jan Engelhardt <jengelh@xxxxxx>

---
crypto/Kconfig | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

Index: linux-2.6.22-rc4/crypto/Kconfig
===================================================================
--- linux-2.6.22-rc4.orig/crypto/Kconfig
+++ linux-2.6.22-rc4/crypto/Kconfig
@@ -7,6 +7,8 @@ menuconfig CRYPTO
help
This option provides the core Cryptographic API.

+if CRYPTO
+
#
# Generic algorithms support
#
@@ -18,8 +20,6 @@ config XOR_BLOCKS
#
source "crypto/async_tx/Kconfig"

-if CRYPTO
-
config CRYPTO_ALGAPI
tristate
help
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/