Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...

[linux-2.6-omap-h63xx.git] / drivers / crypto / Kconfig

diff --git a/drivers/crypto/Kconfig b/drivers/crypto/Kconfig
index e816535ab305e33b06ec2368dc668fa43a4f3b21..ff8c4beaace41577ad384a171a63966e992b01e0 100644 (file)
--- a/drivers/crypto/Kconfig
+++ b/drivers/crypto/Kconfig
@@ -51,9 +51,11 @@ config CRYPTO_DEV_PADLOCK_SHA
          If unsure say M. The compiled module will be
          called padlock-sha.ko
 
+source "arch/s390/crypto/Kconfig"
+
 config CRYPTO_DEV_GEODE
        tristate "Support for the Geode LX AES engine"
-       depends on CRYPTO && X86_32
+       depends on CRYPTO && X86_32 && PCI
        select CRYPTO_ALGAPI
        select CRYPTO_BLKCIPHER
        default m