diff --git a/[refs] b/[refs]
index 81e264f5d869..0dec5feafce8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1dadcce358a4c4078e1ea0bc4365c3f67b8e373e
+refs/heads/master: 25848b3ec681c7018e3746dd850c1e8ed0a3dd6b
diff --git a/trunk/fs/ceph/Kconfig b/trunk/fs/ceph/Kconfig
index 04b8280582a9..bc87b9c1d27e 100644
--- a/trunk/fs/ceph/Kconfig
+++ b/trunk/fs/ceph/Kconfig
@@ -2,7 +2,7 @@ config CEPH_FS
         tristate "Ceph distributed file system (EXPERIMENTAL)"
 	depends on INET && EXPERIMENTAL
 	select LIBCRC32C
-	select CONFIG_CRYPTO_AES
+	select CRYPTO_AES
 	help
 	  Choose Y or M here to include support for mounting the
 	  experimental Ceph distributed file system.  Ceph is an extremely