From 64a260ec6a10ca86f182735a8060c9a87d56957d Mon Sep 17 00:00:00 2001
From: Adrian Hunter <ext-adrian.hunter@nokia.com>
Date: Thu, 31 Jan 2008 17:25:00 +0200
Subject: [PATCH] --- yaml --- r: 102145 b: refs/heads/master c:
 2d62f488585405bc9108c47cb06957397cfd1059 h: refs/heads/master i:   102143:
 3327e60d011cd0cc051c483398851504a04a5366 v: v3

---
 [refs]                 | 2 +-
 trunk/init/do_mounts.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 0d35f1a7311c..8002f1653377 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4ee6afd34409d296782a5b667d7991b1050e910a
+refs/heads/master: 2d62f488585405bc9108c47cb06957397cfd1059
diff --git a/trunk/init/do_mounts.c b/trunk/init/do_mounts.c
index 660c1e50c91b..a1de1bf3d6b9 100644
--- a/trunk/init/do_mounts.c
+++ b/trunk/init/do_mounts.c
@@ -372,7 +372,8 @@ void __init prepare_namespace(void)
 
 	if (saved_root_name[0]) {
 		root_device_name = saved_root_name;
-		if (!strncmp(root_device_name, "mtd", 3)) {
+		if (!strncmp(root_device_name, "mtd", 3) ||
+		    !strncmp(root_device_name, "ubi", 3)) {
 			mount_block_root(root_device_name, root_mountflags);
 			goto out;
 		}