git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm
[pandora-kernel.git]
/
drivers
/
crypto
/
Kconfig
diff --git
a/drivers/crypto/Kconfig
b/drivers/crypto/Kconfig
index
3e72a6a
..
5b27692
100644
(file)
--- a/
drivers/crypto/Kconfig
+++ b/
drivers/crypto/Kconfig
@@
-12,7
+12,7
@@
if CRYPTO_HW
config CRYPTO_DEV_PADLOCK
tristate "Support for VIA PadLock ACE"
- depends on X86
_32
&& !UML
+ depends on X86 && !UML
select CRYPTO_ALGAPI
help
Some VIA processors come with an integrated crypto engine