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/pb1100/init.c | |
| parent | Merge branch 'for-2.6.25' of git://git.secretlab.ca/git/linux-2.6-mpc52xx (diff) | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog (diff) | |
| download | linux-dev-bd45ac0c5daae35e7c71138172e63df5cf644cf6.tar.xz linux-dev-bd45ac0c5daae35e7c71138172e63df5cf644cf6.zip | |
Merge branch 'linux-2.6'
Diffstat (limited to 'arch/mips/au1000/pb1100/init.c')
| -rw-r--r-- | arch/mips/au1000/pb1100/init.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/mips/au1000/pb1100/init.c b/arch/mips/au1000/pb1100/init.c index c93fd39b4aba..490c3801c275 100644 --- a/arch/mips/au1000/pb1100/init.c +++ b/arch/mips/au1000/pb1100/init.c @@ -53,8 +53,6 @@ void __init prom_init(void) prom_argv = (char **) fw_arg1; prom_envp = (char **) fw_arg3; - mips_machtype = MACH_PB1100; - prom_init_cmdline(); memsize_str = prom_getenv("memsize"); |