diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-16 15:02:57 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-16 15:02:57 -0700 |
| commit | 9c1be0c4712fe760d8969427ef91107e9c062d91 (patch) | |
| tree | 01210aba49c120116bb99ba031ff86a525ffb63d /init | |
| parent | 42fdd144a40f3afaccaa7ea538268bad3596439e (diff) | |
| parent | 0d7eff873caaeac84de01a1acdca983d2c7ba3fe (diff) | |
| download | linux-next-9c1be0c4712fe760d8969427ef91107e9c062d91.tar.gz | |
Merge branch 'for_linus' of git://git.infradead.org/~dedekind/ubifs-2.6
* 'for_linus' of git://git.infradead.org/~dedekind/ubifs-2.6:
UBIFS: include to compilation
UBIFS: add new flash file system
UBIFS: add brief documentation
MAINTAINERS: add UBIFS section
do_mounts: allow UBI root device name
VFS: export sync_sb_inodes
VFS: move inode_lock into sync_sb_inodes
Diffstat (limited to 'init')
| -rw-r--r-- | init/do_mounts.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/init/do_mounts.c b/init/do_mounts.c index 660c1e50c91b..a1de1bf3d6b9 100644 --- a/init/do_mounts.c +++ b/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; } |