diff options
| author | Paul Mackerras <paulus@samba.org> | 2008-01-30 19:25:51 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-01-30 19:25:51 -0500 |
| commit | bd45ac0c5daae35e7c71138172e63df5cf644cf6 (patch) | |
| tree | 5eb5a599bf6a9d7a8a34e802db932aa9e9555de4 /arch/mips/au1000/pb1500/init.c | |
| parent | 4eece4ccf997c0e6d8fdad3d842e37b16b8d705f (diff) | |
| parent | 5bdeae46be6dfe9efa44a548bd622af325f4bdb4 (diff) | |
Merge branch 'linux-2.6'
Diffstat (limited to 'arch/mips/au1000/pb1500/init.c')
| -rw-r--r-- | arch/mips/au1000/pb1500/init.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/mips/au1000/pb1500/init.c b/arch/mips/au1000/pb1500/init.c index 507d4b204161..db558c967048 100644 --- a/arch/mips/au1000/pb1500/init.c +++ b/arch/mips/au1000/pb1500/init.c | |||
| @@ -53,8 +53,6 @@ void __init prom_init(void) | |||
| 53 | prom_argv = (char **) fw_arg1; | 53 | prom_argv = (char **) fw_arg1; |
| 54 | prom_envp = (char **) fw_arg2; | 54 | prom_envp = (char **) fw_arg2; |
| 55 | 55 | ||
| 56 | mips_machtype = MACH_PB1500; | ||
| 57 | |||
| 58 | prom_init_cmdline(); | 56 | prom_init_cmdline(); |
| 59 | memsize_str = prom_getenv("memsize"); | 57 | memsize_str = prom_getenv("memsize"); |
| 60 | if (!memsize_str) { | 58 | if (!memsize_str) { |