---

yaml --- r: 336095 b: refs/heads/master c: 9665c52 h: refs/heads/master i: 336093: d1ce05e 336091: f25c116 336087: 4f00606 336079: 38222ba 336063: 4f81279 v: v3
git-mirror · Nov 22, 2012 · 6e20c50 · 6e20c50
1 parent e9ef78d
commit 6e20c50
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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