From 8861d60e0c187da3c1a0ef28f834cfe6b94abaab Mon Sep 17 00:00:00 2001 From: Randy Dunlap Date: Fri, 23 May 2008 09:44:11 -0700 Subject: [PATCH] --- yaml --- r: 104747 b: refs/heads/master c: a6e2ba88774bc5870ab3d9664cb86d70415f7402 h: refs/heads/master i: 104745: c71ce7c2028503e7bfebbd9b6b22f16f4882988e 104743: 9d887fe0e6318c9c64a915e5ed709a92f504af40 v: v3 --- [refs] | 2 +- trunk/block/genhd.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) 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) {