diff options
| author | Paul Mackerras <paulus@samba.org> | 2008-01-31 11:25:51 +1100 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-01-31 11:25:51 +1100 |
| commit | bd45ac0c5daae35e7c71138172e63df5cf644cf6 (patch) | |
| tree | 5eb5a599bf6a9d7a8a34e802db932aa9e9555de4 /arch/mips/au1000/pb1500/init.c | |
| parent | 4eece4ccf997c0e6d8fdad3d842e37b16b8d705f (diff) | |
| parent | 5bdeae46be6dfe9efa44a548bd622af325f4bdb4 (diff) | |
| download | op-kernel-dev-bd45ac0c5daae35e7c71138172e63df5cf644cf6.zip op-kernel-dev-bd45ac0c5daae35e7c71138172e63df5cf644cf6.tar.gz | |
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 507d4b2..db558c9 100644 --- a/arch/mips/au1000/pb1500/init.c +++ b/arch/mips/au1000/pb1500/init.c @@ -53,8 +53,6 @@ void __init prom_init(void) prom_argv = (char **) fw_arg1; prom_envp = (char **) fw_arg2; - mips_machtype = MACH_PB1500; - prom_init_cmdline(); memsize_str = prom_getenv("memsize"); if (!memsize_str) { |
