diff options
author | Colin Cross <ccross@android.com> | 2012-05-07 18:20:34 -0700 |
---|---|---|
committer | Colin Cross <ccross@android.com> | 2012-05-07 18:20:34 -0700 |
commit | f02fac63308349b1dbde468adfd084fdb560eeae (patch) | |
tree | 35c39e5c3c70e40c52bc18c07a88dd7a1becb649 /init | |
parent | 6ff6845be02be8d53da28d2333a015d54b1234db (diff) | |
parent | d48b97b403d23f6df0b990cee652bdf9a52337a3 (diff) |
Merge commit 'v3.4-rc6' into android-3.4
Conflicts:
arch/arm/mm/cache-l2x0.c
arch/arm/mm/mmu.c
Change-Id: If4f371a21c052fa597d107c44b128a093e4a8b91
Diffstat (limited to 'init')
-rw-r--r-- | init/do_mounts.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/init/do_mounts.c b/init/do_mounts.c index 0e93f92a034..42b0707c348 100644 --- a/init/do_mounts.c +++ b/init/do_mounts.c @@ -472,7 +472,7 @@ void __init change_floppy(char *fmt, ...) void __init mount_root(void) { #ifdef CONFIG_ROOT_NFS - if (MAJOR(ROOT_DEV) == UNNAMED_MAJOR) { + if (ROOT_DEV == Root_NFS) { if (mount_nfs_root()) return; |