From 90ffc571f5c2980a14f9533e1eee395529284629 Mon Sep 17 00:00:00 2001
From: Jens Axboe <jaxboe@fusionio.com>
Date: Fri, 17 Sep 2010 10:00:46 +0200
Subject: [PATCH] --- yaml --- r: 213053 b: refs/heads/master c:
 6d0aed7a38d06284db2a0e46c0a072b0c1c3299b h: refs/heads/master i:   213051:
 471c905253184a7419615faa5e70d97b13ed4630 v: v3

---
 [refs]                 | 2 +-
 trunk/init/do_mounts.c | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 4e7d82237df7..5c1ee813ee66 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 01ea50638bc04ca5259f5711fcdedefcdde1cf43
+refs/heads/master: 6d0aed7a38d06284db2a0e46c0a072b0c1c3299b
diff --git a/trunk/init/do_mounts.c b/trunk/init/do_mounts.c
index b7fc83994f39..42db0551c3aa 100644
--- a/trunk/init/do_mounts.c
+++ b/trunk/init/do_mounts.c
@@ -58,6 +58,7 @@ static int __init readwrite(char *str)
 __setup("ro", readonly);
 __setup("rw", readwrite);
 
+#ifdef CONFIG_BLOCK
 /**
  * match_dev_by_uuid - callback for finding a partition using its uuid
  * @dev:	device passed in by the caller
@@ -111,6 +112,7 @@ static dev_t __init devt_from_partuuid(char *uuid_str)
 done:
 	return res;
 }
+#endif
 
 /*
  *	Convert a name into device number.  We accept the following variants:
@@ -138,6 +140,7 @@ dev_t name_to_dev_t(char *name)
 	dev_t res = 0;
 	int part;
 
+#ifdef CONFIG_BLOCK
 	if (strncmp(name, "PARTUUID=", 9) == 0) {
 		name += 9;
 		if (strlen(name) != 36)
@@ -147,6 +150,7 @@ dev_t name_to_dev_t(char *name)
 			goto fail;
 		goto done;
 	}
+#endif
 
 	if (strncmp(name, "/dev/", 5) != 0) {
 		unsigned maj, min;