From 77a95f3b5adf7ce1a7862209125de034503cf770 Mon Sep 17 00:00:00 2001
From: Adrian Bunk <bunk@kernel.org>
Date: Fri, 25 Jul 2008 19:46:25 -0700
Subject: [PATCH] --- yaml --- r: 106257 b: refs/heads/master c:
 f56f6d30c75984d0aba2656eaeb35f3806395191 h: refs/heads/master i:   106255:
 5397d9be38cd1285246b315967225bc77721b666 v: v3

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

diff --git a/[refs] b/[refs]
index 72c2df5ac687..5dabd610137d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9580d85f9cdb076c4bfb467bc6c0d3c5e499957a
+refs/heads/master: f56f6d30c75984d0aba2656eaeb35f3806395191
diff --git a/trunk/init/do_mounts.c b/trunk/init/do_mounts.c
index f769fac4f4c0..3715feb8446d 100644
--- a/trunk/init/do_mounts.c
+++ b/trunk/init/do_mounts.c
@@ -23,7 +23,7 @@
 int __initdata rd_doload;	/* 1 = load RAM disk, 0 = don't load */
 
 int root_mountflags = MS_RDONLY | MS_SILENT;
-char * __initdata root_device_name;
+static char * __initdata root_device_name;
 static char __initdata saved_root_name[64];
 static int __initdata root_wait;
 
diff --git a/trunk/init/do_mounts.h b/trunk/init/do_mounts.h
index 735705d137ff..9aa968d54329 100644
--- a/trunk/init/do_mounts.h
+++ b/trunk/init/do_mounts.h
@@ -11,7 +11,6 @@ void  change_floppy(char *fmt, ...);
 void  mount_block_root(char *name, int flags);
 void  mount_root(void);
 extern int root_mountflags;
-extern char *root_device_name;
 
 static inline int create_dev(char *name, dev_t dev)
 {