aboutsummaryrefslogtreecommitdiffstats
path: root/init
diff options
context:
space:
mode:
authorKalimochoAz <calimochoazucarado@gmail.com>2012-05-22 06:12:10 +0200
committerKalimochoAz <calimochoazucarado@gmail.com>2012-05-22 06:12:10 +0200
commit93cf213940db180b5bb710d21fe2f6dc7ca1e252 (patch)
treec377b29f5387081dc64c882e7dad2ac4a2c161e3 /init
parenta48c18e8b30a8ec31acb09d45741fd99dd5baf06 (diff)
parent091ce3d38e5e57cf7dd44d66335725910e928f59 (diff)
downloadkernel_samsung_crespo-93cf213940db180b5bb710d21fe2f6dc7ca1e252.zip
kernel_samsung_crespo-93cf213940db180b5bb710d21fe2f6dc7ca1e252.tar.gz
kernel_samsung_crespo-93cf213940db180b5bb710d21fe2f6dc7ca1e252.tar.bz2
Merge branch 'linux-3.0.y' into HEAD
Diffstat (limited to 'init')
-rw-r--r--init/do_mounts.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/init/do_mounts.c b/init/do_mounts.c
index ef6478f..8959eb3 100644
--- a/init/do_mounts.c
+++ b/init/do_mounts.c
@@ -432,7 +432,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;