diff --git a/[refs] b/[refs]
index a9238eb8a213..5b5170e0cc42 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a142be856f060ae8106512c0e81a8d6f8746ab0b
+refs/heads/master: a6e2ba88774bc5870ab3d9664cb86d70415f7402
diff --git a/trunk/block/genhd.c b/trunk/block/genhd.c
index e8c42bfd12be..68a5f28007e4 100644
--- a/trunk/block/genhd.c
+++ b/trunk/block/genhd.c
@@ -544,6 +544,7 @@ static struct device_type disk_type = {
 	.release	= disk_release,
 };
 
+#ifdef CONFIG_PROC_FS
 /*
  * aggregate disk stat collector.  Uses the same stats that the sysfs
  * entries do, above, but makes them available through one seq_file.
@@ -653,6 +654,7 @@ const struct seq_operations diskstats_op = {
 	.stop	= diskstats_stop,
 	.show	= diskstats_show
 };
+#endif /* CONFIG_PROC_FS */
 
 static void media_change_notify_thread(struct work_struct *work)
 {