diff options
-rw-r--r-- | arch/mips/alchemy/common/prom.c | 9 | ||||
-rw-r--r-- | arch/mips/include/asm/mach-au1x00/prom.h | 1 |
2 files changed, 1 insertions, 9 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; | |||
43 | char **prom_argv; | 43 | char **prom_argv; |
44 | char **prom_envp; | 44 | char **prom_envp; |
45 | 45 | ||
46 | char * __init_or_module prom_getcmdline(void) | ||
47 | { | ||
48 | return &(arcs_cmdline[0]); | ||
49 | } | ||
50 | |||
51 | void prom_init_cmdline(void) | 46 | void 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) | |||
121 | int prom_get_ethernet_addr(char *ethernet_addr) | 116 | int 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 | ||
diff --git a/arch/mips/include/asm/mach-au1x00/prom.h b/arch/mips/include/asm/mach-au1x00/prom.h index e38715577c51..4c0e09cf1735 100644 --- a/arch/mips/include/asm/mach-au1x00/prom.h +++ b/arch/mips/include/asm/mach-au1x00/prom.h | |||
@@ -6,7 +6,6 @@ extern char **prom_argv; | |||
6 | extern char **prom_envp; | 6 | extern char **prom_envp; |
7 | 7 | ||
8 | extern void prom_init_cmdline(void); | 8 | extern void prom_init_cmdline(void); |
9 | extern char *prom_getcmdline(void); | ||
10 | extern char *prom_getenv(char *envname); | 9 | extern char *prom_getenv(char *envname); |
11 | extern int prom_get_ethernet_addr(char *ethernet_addr); | 10 | extern int prom_get_ethernet_addr(char *ethernet_addr); |
12 | 11 | ||