--- ./crypto/Config.in.orig	Sat Nov 29 22:50:47 2003
+++ ./crypto/Config.in	Sat Nov 29 22:51:47 2003
@@ -90,7 +90,13 @@
   tristate       '  Blowfish cipher algorithm' CONFIG_CRYPTO_BLOWFISH
   tristate       '  Twofish cipher algorithm' CONFIG_CRYPTO_TWOFISH
   tristate       '  Serpent cipher algorithm' CONFIG_CRYPTO_SERPENT
-  tristate       '  AES cipher algorithms' CONFIG_CRYPTO_AES
+  tristate       '  AES cipher algorithm' CONFIG_CRYPTO_AES
+  if [ "$CONFIG_X86" = "y" -a \
+       "$CONFIG_X86_64" != "y" -a \
+       "$CONFIG_M386" != "y" -a \
+       "$CONFIG_M486" != "y" ]; then
+    dep_mbool       '    use assembler optimized AES implementation' CONFIG_CRYPTO_AES_ASM $CONFIG_CRYPTO_AES
+  fi
   tristate       '  CAST5 (CAST-128) cipher algorithm' CONFIG_CRYPTO_CAST5
   tristate       '  CAST6 (CAST-256) cipher algorithm' CONFIG_CRYPTO_CAST6
   if [ "$CONFIG_INET_IPCOMP" = "y" -o \