From 0adfa8603bd102c9ff6a8cbfdfb6825e4b853527 Mon Sep 17 00:00:00 2001
From: Yoichi Yuasa <yuasa@linux-mips.org>
Date: Mon, 1 Feb 2010 22:05:57 +0900
Subject: [PATCH] --- yaml --- r: 182094 b: refs/heads/master c:
 ae7cbef5e5789e2ee6855222a3b83eb94591ef0b h: refs/heads/master v: v3

---
 [refs]                                         | 2 +-
 trunk/arch/mips/alchemy/common/prom.c          | 9 +--------
 trunk/arch/mips/include/asm/mach-au1x00/prom.h | 1 -
 3 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/[refs] b/[refs]
index 9ba021571019..501286d55f2e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c63d0cb5feedbc2cc456b6ea2105c15b563217cf
+refs/heads/master: ae7cbef5e5789e2ee6855222a3b83eb94591ef0b
diff --git a/trunk/arch/mips/alchemy/common/prom.c b/trunk/arch/mips/alchemy/common/prom.c
index 18b310b475ca..79e099fbc0bf 100644
--- a/trunk/arch/mips/alchemy/common/prom.c
+++ b/trunk/arch/mips/alchemy/common/prom.c
@@ -43,11 +43,6 @@ int prom_argc;
 char **prom_argv;
 char **prom_envp;
 
-char * __init_or_module prom_getcmdline(void)
-{
-	return &(arcs_cmdline[0]);
-}
-
 void prom_init_cmdline(void)
 {
 	char *cp;
@@ -121,14 +116,12 @@ static inline void str2eaddr(unsigned char *ea, unsigned char *str)
 int prom_get_ethernet_addr(char *ethernet_addr)
 {
 	char *ethaddr_str;
-	char *argptr;
 
 	/* Check the environment variables first */
 	ethaddr_str = prom_getenv("ethaddr");
 	if (!ethaddr_str) {
 		/* Check command line */
-		argptr = prom_getcmdline();
-		ethaddr_str = strstr(argptr, "ethaddr=");
+		ethaddr_str = strstr(arcs_cmdline, "ethaddr=");
 		if (!ethaddr_str)
 			return -1;
 
diff --git a/trunk/arch/mips/include/asm/mach-au1x00/prom.h b/trunk/arch/mips/include/asm/mach-au1x00/prom.h
index e38715577c51..4c0e09cf1735 100644
--- a/trunk/arch/mips/include/asm/mach-au1x00/prom.h
+++ b/trunk/arch/mips/include/asm/mach-au1x00/prom.h
@@ -6,7 +6,6 @@ extern char **prom_argv;
 extern char **prom_envp;
 
 extern void prom_init_cmdline(void);
-extern char *prom_getcmdline(void);
 extern char *prom_getenv(char *envname);
 extern int prom_get_ethernet_addr(char *ethernet_addr);