diff options
Diffstat (limited to 'arch/mips')
-rw-r--r-- | arch/mips/mipssim/Makefile | 3 | ||||
-rw-r--r-- | arch/mips/mipssim/sim_cmdline.c | 32 | ||||
-rw-r--r-- | arch/mips/mipssim/sim_setup.c | 1 |
3 files changed, 1 insertions, 35 deletions
diff --git a/arch/mips/mipssim/Makefile b/arch/mips/mipssim/Makefile index 57f43c1c7882..41b96571315e 100644 --- a/arch/mips/mipssim/Makefile +++ b/arch/mips/mipssim/Makefile | |||
@@ -17,8 +17,7 @@ | |||
17 | # 59 Temple Place - Suite 330, Boston MA 02111-1307, USA. | 17 | # 59 Temple Place - Suite 330, Boston MA 02111-1307, USA. |
18 | # | 18 | # |
19 | 19 | ||
20 | obj-y := sim_platform.o sim_setup.o sim_mem.o sim_time.o sim_int.o \ | 20 | obj-y := sim_platform.o sim_setup.o sim_mem.o sim_time.o sim_int.o |
21 | sim_cmdline.o | ||
22 | 21 | ||
23 | obj-$(CONFIG_EARLY_PRINTK) += sim_console.o | 22 | obj-$(CONFIG_EARLY_PRINTK) += sim_console.o |
24 | obj-$(CONFIG_MIPS_MT_SMTC) += sim_smtc.o | 23 | obj-$(CONFIG_MIPS_MT_SMTC) += sim_smtc.o |
diff --git a/arch/mips/mipssim/sim_cmdline.c b/arch/mips/mipssim/sim_cmdline.c deleted file mode 100644 index 74240e1ce5a5..000000000000 --- a/arch/mips/mipssim/sim_cmdline.c +++ /dev/null | |||
@@ -1,32 +0,0 @@ | |||
1 | /* | ||
2 | * Copyright (C) 2005 MIPS Technologies, Inc. All rights reserved. | ||
3 | * | ||
4 | * This program is free software; you can distribute it and/or modify it | ||
5 | * under the terms of the GNU General Public License (Version 2) as | ||
6 | * published by the Free Software Foundation. | ||
7 | * | ||
8 | * This program is distributed in the hope it will be useful, but WITHOUT | ||
9 | * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | ||
10 | * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | ||
11 | * for more details. | ||
12 | * | ||
13 | * You should have received a copy of the GNU General Public License along | ||
14 | * with this program; if not, write to the Free Software Foundation, Inc., | ||
15 | * 59 Temple Place - Suite 330, Boston MA 02111-1307, USA. | ||
16 | * | ||
17 | */ | ||
18 | #include <linux/init.h> | ||
19 | #include <linux/string.h> | ||
20 | #include <asm/bootinfo.h> | ||
21 | |||
22 | extern char arcs_cmdline[]; | ||
23 | |||
24 | char * __init prom_getcmdline(void) | ||
25 | { | ||
26 | return arcs_cmdline; | ||
27 | } | ||
28 | |||
29 | void __init prom_init_cmdline(void) | ||
30 | { | ||
31 | /* XXX: Get boot line from environment? */ | ||
32 | } | ||
diff --git a/arch/mips/mipssim/sim_setup.c b/arch/mips/mipssim/sim_setup.c index 2877675c5f0d..0824f6af4777 100644 --- a/arch/mips/mipssim/sim_setup.c +++ b/arch/mips/mipssim/sim_setup.c | |||
@@ -61,7 +61,6 @@ void __init prom_init(void) | |||
61 | set_io_port_base(0xbfd00000); | 61 | set_io_port_base(0xbfd00000); |
62 | 62 | ||
63 | pr_info("\nLINUX started...\n"); | 63 | pr_info("\nLINUX started...\n"); |
64 | prom_init_cmdline(); | ||
65 | prom_meminit(); | 64 | prom_meminit(); |
66 | 65 | ||
67 | #ifdef CONFIG_MIPS_MT_SMP | 66 | #ifdef CONFIG_MIPS_MT_SMP |