diff --git a/[refs] b/[refs]
index d7ccae263300..6858b2a4d649 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7607bd8ff03b8af5af887931318cb2bb20361856
+refs/heads/master: c5a511f1cd6f90a98ad11dd97e2313c7c787deb2
diff --git a/trunk/crypto/Makefile b/trunk/crypto/Makefile
index e96a07e16bf2..a624cbc188fc 100644
--- a/trunk/crypto/Makefile
+++ b/trunk/crypto/Makefile
@@ -33,7 +33,7 @@ obj-$(CONFIG_CRYPTO_PCBC) += pcbc.o
 obj-$(CONFIG_CRYPTO_LRW) += lrw.o
 obj-$(CONFIG_CRYPTO_XTS) += xts.o
 obj-$(CONFIG_CRYPTO_CRYPTD) += cryptd.o
-obj-$(CONFIG_CRYPTO_DES) += des.o
+obj-$(CONFIG_CRYPTO_DES) += des_generic.o
 obj-$(CONFIG_CRYPTO_FCRYPT) += fcrypt.o
 obj-$(CONFIG_CRYPTO_BLOWFISH) += blowfish.o
 obj-$(CONFIG_CRYPTO_TWOFISH) += twofish.o
diff --git a/trunk/crypto/des.c b/trunk/crypto/des_generic.c
similarity index 99%
rename from trunk/crypto/des.c
rename to trunk/crypto/des_generic.c
index 1df3a714fa47..59966d14b8e0 100644
--- a/trunk/crypto/des.c
+++ b/trunk/crypto/des_generic.c
@@ -1009,3 +1009,4 @@ module_exit(fini);
 MODULE_LICENSE("GPL");
 MODULE_DESCRIPTION("DES & Triple DES EDE Cipher Algorithms");
 MODULE_AUTHOR("Dag Arne Osvik <da@osvik.no>");
+MODULE_ALIAS("des");