diff --git a/[refs] b/[refs]
index 8d366b5e8af1..77124c1a2633 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fbeba8bb16d7c50362e28f3f91a79fb414903199
+refs/heads/master: 607a569da4cf289fd8eb3887080ed3b212e3112d
diff --git a/trunk/fs/cifs/connect.c b/trunk/fs/cifs/connect.c
index 251a17c03545..32fa4d9b5dbc 100644
--- a/trunk/fs/cifs/connect.c
+++ b/trunk/fs/cifs/connect.c
@@ -1352,6 +1352,11 @@ cifs_parse_mount_options(char *options, const char *devname,
 				"supported. Instead set "
 				"/proc/fs/cifs/LookupCacheEnabled to 0\n");
 		} else if (strnicmp(data, "fsc", 3) == 0) {
+#ifndef CONFIG_CIFS_FSCACHE
+			cERROR(1, "FS-Cache support needs CONFIG_CIFS_FSCACHE"
+				  "kernel config option set");
+			return 1;
+#endif
 			vol->fsc = true;
 		} else if (strnicmp(data, "mfsymlinks", 10) == 0) {
 			vol->mfsymlinks = true;