projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
[cascardo/linux.git]
/
drivers
/
crypto
/
Kconfig
diff --git
a/drivers/crypto/Kconfig
b/drivers/crypto/Kconfig
index
d8c7040
..
74bd599
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
+ depends on X86_32
&& !UML
select CRYPTO_ALGAPI
help
Some VIA processors come with an integrated crypto engine