Merge \"Remove MTD cruft from init.\"

am: 90db709a2f

Change-Id: I027708dd324000cbfad1a2a6e970f742db97bae5

1 files changed, 1 insertions, 16 deletions

diff --git a/init/builtins.cpp b/init/builtins.cpp
index 70f3cdeb9b..c9be50a8d1 100644
--- a/init/builtins.cpp
+++ b/init/builtins.cpp
@@ -401,22 +401,7 @@ static int do_mount(const std::vector<std::string>& args) {
     source = args[2].c_str();
     target = args[3].c_str();
 
-    if (!strncmp(source, "mtd@", 4)) {
-        n = mtd_name_to_number(source + 4);
-        if (n < 0) {
-            return -1;
-        }
-
-        snprintf(tmp, sizeof(tmp), "/dev/block/mtdblock%d", n);
-
-        if (wait)
-            wait_for_file(tmp, COMMAND_RETRY_TIMEOUT);
-        if (mount(tmp, target, system, flags, options) < 0) {
-            return -1;
-        }
-
-        goto exit_success;
-    } else if (!strncmp(source, "loop@", 5)) {
+    if (!strncmp(source, "loop@", 5)) {
         int mode, loop, fd;
         struct loop_info info;