git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
x86: use generic per-device dma coherent allocator
[pandora-kernel.git]
/
arch
/
mips
/
jmr3927
/
common
/
prom.c
diff --git
a/arch/mips/jmr3927/common/prom.c
b/arch/mips/jmr3927/common/prom.c
index
aa481b7
..
5398813
100644
(file)
--- a/
arch/mips/jmr3927/common/prom.c
+++ b/
arch/mips/jmr3927/common/prom.c
@@
-41,16
+41,6
@@
#include <asm/bootinfo.h>
#include <asm/bootinfo.h>
-extern int prom_argc;
-extern char **prom_argv, **prom_envp;
-
-typedef struct
-{
- char *name;
-/* char *val; */
-}t_env_var;
-
-
char * __init prom_getcmdline(void)
{
return &(arcs_cmdline[0]);
char * __init prom_getcmdline(void)
{
return &(arcs_cmdline[0]);
@@
-60,6
+50,8
@@
void __init prom_init_cmdline(void)
{
char *cp;
int actr;
{
char *cp;
int actr;
+ int prom_argc = fw_arg0;
+ char **prom_argv = (char **) fw_arg1;
actr = 1; /* Always ignore argv[0] */
actr = 1; /* Always ignore argv[0] */