From 6e20c502fa8e77b70ae9afaff07b038383ba5a7e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Krzysztof=20Ha=C5=82asa?= <khc@pm.waw.pl>
Date: Thu, 25 Mar 2010 23:56:05 +0100
Subject: [PATCH] --- yaml --- r: 336095 b: refs/heads/master c:
 9665c52b102504399a9f041b85ff9f47c5d56bb3 h: refs/heads/master i:   336093:
 d1ce05e2608239bef21c631c3d699ef295a8c892   336091:
 f25c1166dd38e46bf013aed5d05b3d56e0d976a5   336087:
 4f00606024e8cba2a6ed5e5f0d71f6ddf381bd53   336079:
 38222bad714e11bdc5a1fee3c8c3d903df6be380   336063:
 4f81279471aee66446b0c019176a97422967f92c v: v3

---
 [refs]                       | 2 +-
 trunk/drivers/crypto/Kconfig | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index e42916cd217b..354ad09fda89 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 553da857b1b917e27817b923ea2c786313620845
+refs/heads/master: 9665c52b102504399a9f041b85ff9f47c5d56bb3
diff --git a/trunk/drivers/crypto/Kconfig b/trunk/drivers/crypto/Kconfig
index 308c7fb92a60..f6644f59fd9d 100644
--- a/trunk/drivers/crypto/Kconfig
+++ b/trunk/drivers/crypto/Kconfig
@@ -224,7 +224,7 @@ config CRYPTO_DEV_TALITOS
 
 config CRYPTO_DEV_IXP4XX
 	tristate "Driver for IXP4xx crypto hardware acceleration"
-	depends on ARCH_IXP4XX
+	depends on ARCH_IXP4XX && IXP4XX_QMGR && IXP4XX_NPE
 	select CRYPTO_DES
 	select CRYPTO_ALGAPI
 	select CRYPTO_AUTHENC