aboutsummaryrefslogtreecommitdiffstats
path: root/arch/mips/alchemy
diff options
context:
space:
mode:
Diffstat (limited to 'arch/mips/alchemy')
-rw-r--r--arch/mips/alchemy/common/prom.c9
1 files changed, 1 insertions, 8 deletions
diff --git a/arch/mips/alchemy/common/prom.c b/arch/mips/alchemy/common/prom.c
index 18b310b475ca..79e099fbc0bf 100644
--- a/arch/mips/alchemy/common/prom.c
+++ b/arch/mips/alchemy/common/prom.c
@@ -43,11 +43,6 @@ int prom_argc;
43char **prom_argv; 43char **prom_argv;
44char **prom_envp; 44char **prom_envp;
45 45
46char * __init_or_module prom_getcmdline(void)
47{
48 return &(arcs_cmdline[0]);
49}
50
51void prom_init_cmdline(void) 46void prom_init_cmdline(void)
52{ 47{
53 char *cp; 48 char *cp;
@@ -121,14 +116,12 @@ static inline void str2eaddr(unsigned char *ea, unsigned char *str)
121int prom_get_ethernet_addr(char *ethernet_addr) 116int prom_get_ethernet_addr(char *ethernet_addr)
122{ 117{
123 char *ethaddr_str; 118 char *ethaddr_str;
124 char *argptr;
125 119
126 /* Check the environment variables first */ 120 /* Check the environment variables first */
127 ethaddr_str = prom_getenv("ethaddr"); 121 ethaddr_str = prom_getenv("ethaddr");
128 if (!ethaddr_str) { 122 if (!ethaddr_str) {
129 /* Check command line */ 123 /* Check command line */
130 argptr = prom_getcmdline(); 124 ethaddr_str = strstr(arcs_cmdline, "ethaddr=");
131 ethaddr_str = strstr(argptr, "ethaddr=");
132 if (!ethaddr_str) 125 if (!ethaddr_str)
133 return -1; 126 return -1;
134 127