diff options
author | Yoichi Yuasa <yuasa@hh.iij4u.or.jp> | 2005-09-03 18:56:05 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@evo.osdl.org> | 2005-09-05 03:06:02 -0400 |
commit | 8bb670c1407c2a4890810fd3e348dac1b89e669e (patch) | |
tree | a001088c4c8fe47fee724f883ed710a76fb192a6 /arch/mips | |
parent | 979934da9e7a0005bd9c8b1d7d00febb59ff67f7 (diff) |
[PATCH] mips: change system type name in proc for vr41xx
This patch has changed system type name in proc for vr41xx.
Signed-off-by: Yoichi Yuasa <yuasa@hh.iij4u.or.jp>
Cc: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/mips')
-rw-r--r-- | arch/mips/Makefile | 4 | ||||
-rw-r--r-- | arch/mips/vr41xx/casio-e55/setup.c | 5 | ||||
-rw-r--r-- | arch/mips/vr41xx/common/Makefile | 2 | ||||
-rw-r--r-- | arch/mips/vr41xx/common/type.c (renamed from arch/mips/vr41xx/tanbac-tb0226/setup.c) | 6 | ||||
-rw-r--r-- | arch/mips/vr41xx/ibm-workpad/setup.c | 5 | ||||
-rw-r--r-- | arch/mips/vr41xx/nec-cmbvr4133/init.c | 12 | ||||
-rw-r--r-- | arch/mips/vr41xx/tanbac-tb0226/Makefile | 5 | ||||
-rw-r--r-- | arch/mips/vr41xx/tanbac-tb0229/Makefile | 5 | ||||
-rw-r--r-- | arch/mips/vr41xx/tanbac-tb0229/setup.c | 27 | ||||
-rw-r--r-- | arch/mips/vr41xx/victor-mpc30x/Makefile | 5 | ||||
-rw-r--r-- | arch/mips/vr41xx/victor-mpc30x/setup.c | 24 | ||||
-rw-r--r-- | arch/mips/vr41xx/zao-capcella/Makefile | 5 | ||||
-rw-r--r-- | arch/mips/vr41xx/zao-capcella/setup.c | 24 |
13 files changed, 4 insertions, 125 deletions
diff --git a/arch/mips/Makefile b/arch/mips/Makefile index bc1c44274a58..bf874f45144f 100644 --- a/arch/mips/Makefile +++ b/arch/mips/Makefile | |||
@@ -490,13 +490,11 @@ load-$(CONFIG_NEC_CMBVR4133) += 0xffffffff80100000 | |||
490 | # | 490 | # |
491 | # ZAO Networks Capcella (VR4131) | 491 | # ZAO Networks Capcella (VR4131) |
492 | # | 492 | # |
493 | core-$(CONFIG_ZAO_CAPCELLA) += arch/mips/vr41xx/zao-capcella/ | ||
494 | load-$(CONFIG_ZAO_CAPCELLA) += 0xffffffff80000000 | 493 | load-$(CONFIG_ZAO_CAPCELLA) += 0xffffffff80000000 |
495 | 494 | ||
496 | # | 495 | # |
497 | # Victor MP-C303/304 (VR4122) | 496 | # Victor MP-C303/304 (VR4122) |
498 | # | 497 | # |
499 | core-$(CONFIG_VICTOR_MPC30X) += arch/mips/vr41xx/victor-mpc30x/ | ||
500 | load-$(CONFIG_VICTOR_MPC30X) += 0xffffffff80001000 | 498 | load-$(CONFIG_VICTOR_MPC30X) += 0xffffffff80001000 |
501 | 499 | ||
502 | # | 500 | # |
@@ -514,13 +512,11 @@ load-$(CONFIG_CASIO_E55) += 0xffffffff80004000 | |||
514 | # | 512 | # |
515 | # TANBAC TB0226 Mbase (VR4131) | 513 | # TANBAC TB0226 Mbase (VR4131) |
516 | # | 514 | # |
517 | core-$(CONFIG_TANBAC_TB0226) += arch/mips/vr41xx/tanbac-tb0226/ | ||
518 | load-$(CONFIG_TANBAC_TB0226) += 0xffffffff80000000 | 515 | load-$(CONFIG_TANBAC_TB0226) += 0xffffffff80000000 |
519 | 516 | ||
520 | # | 517 | # |
521 | # TANBAC TB0229 VR4131DIMM (VR4131) | 518 | # TANBAC TB0229 VR4131DIMM (VR4131) |
522 | # | 519 | # |
523 | core-$(CONFIG_TANBAC_TB0229) += arch/mips/vr41xx/tanbac-tb0229/ | ||
524 | load-$(CONFIG_TANBAC_TB0229) += 0xffffffff80000000 | 520 | load-$(CONFIG_TANBAC_TB0229) += 0xffffffff80000000 |
525 | 521 | ||
526 | # | 522 | # |
diff --git a/arch/mips/vr41xx/casio-e55/setup.c b/arch/mips/vr41xx/casio-e55/setup.c index aa8605ab76ff..d29201acc4f3 100644 --- a/arch/mips/vr41xx/casio-e55/setup.c +++ b/arch/mips/vr41xx/casio-e55/setup.c | |||
@@ -23,11 +23,6 @@ | |||
23 | #include <asm/io.h> | 23 | #include <asm/io.h> |
24 | #include <asm/vr41xx/e55.h> | 24 | #include <asm/vr41xx/e55.h> |
25 | 25 | ||
26 | const char *get_system_type(void) | ||
27 | { | ||
28 | return "CASIO CASSIOPEIA E-11/15/55/65"; | ||
29 | } | ||
30 | |||
31 | static int __init casio_e55_setup(void) | 26 | static int __init casio_e55_setup(void) |
32 | { | 27 | { |
33 | set_io_port_base(IO_PORT_BASE); | 28 | set_io_port_base(IO_PORT_BASE); |
diff --git a/arch/mips/vr41xx/common/Makefile b/arch/mips/vr41xx/common/Makefile index e5039031b69d..9096302a7ecc 100644 --- a/arch/mips/vr41xx/common/Makefile +++ b/arch/mips/vr41xx/common/Makefile | |||
@@ -2,7 +2,7 @@ | |||
2 | # Makefile for common code of the NEC VR4100 series. | 2 | # Makefile for common code of the NEC VR4100 series. |
3 | # | 3 | # |
4 | 4 | ||
5 | obj-y += bcu.o cmu.o icu.o init.o int-handler.o irq.o pmu.o | 5 | obj-y += bcu.o cmu.o icu.o init.o int-handler.o irq.o pmu.o type.o |
6 | obj-$(CONFIG_VRC4173) += vrc4173.o | 6 | obj-$(CONFIG_VRC4173) += vrc4173.o |
7 | 7 | ||
8 | EXTRA_AFLAGS := $(CFLAGS) | 8 | EXTRA_AFLAGS := $(CFLAGS) |
diff --git a/arch/mips/vr41xx/tanbac-tb0226/setup.c b/arch/mips/vr41xx/common/type.c index 60027e5dea25..bcb5f71b5026 100644 --- a/arch/mips/vr41xx/tanbac-tb0226/setup.c +++ b/arch/mips/vr41xx/common/type.c | |||
@@ -1,7 +1,7 @@ | |||
1 | /* | 1 | /* |
2 | * setup.c, Setup for the TANBAC TB0226. | 2 | * type.c, System type for NEC VR4100 series. |
3 | * | 3 | * |
4 | * Copyright (C) 2002-2005 Yoichi Yuasa <yuasa@hh.iij4u.or.jp> | 4 | * Copyright (C) 2005 Yoichi Yuasa <yuasa@hh.iij4u.or.jp> |
5 | * | 5 | * |
6 | * This program is free software; you can redistribute it and/or modify | 6 | * This program is free software; you can redistribute it and/or modify |
7 | * it under the terms of the GNU General Public License as published by | 7 | * it under the terms of the GNU General Public License as published by |
@@ -20,5 +20,5 @@ | |||
20 | 20 | ||
21 | const char *get_system_type(void) | 21 | const char *get_system_type(void) |
22 | { | 22 | { |
23 | return "TANBAC TB0226"; | 23 | return "NEC VR4100 series"; |
24 | } | 24 | } |
diff --git a/arch/mips/vr41xx/ibm-workpad/setup.c b/arch/mips/vr41xx/ibm-workpad/setup.c index cff44602d3d4..e4b34ad6ea61 100644 --- a/arch/mips/vr41xx/ibm-workpad/setup.c +++ b/arch/mips/vr41xx/ibm-workpad/setup.c | |||
@@ -23,11 +23,6 @@ | |||
23 | #include <asm/io.h> | 23 | #include <asm/io.h> |
24 | #include <asm/vr41xx/workpad.h> | 24 | #include <asm/vr41xx/workpad.h> |
25 | 25 | ||
26 | const char *get_system_type(void) | ||
27 | { | ||
28 | return "IBM WorkPad z50"; | ||
29 | } | ||
30 | |||
31 | static int __init ibm_workpad_setup(void) | 26 | static int __init ibm_workpad_setup(void) |
32 | { | 27 | { |
33 | set_io_port_base(IO_PORT_BASE); | 28 | set_io_port_base(IO_PORT_BASE); |
diff --git a/arch/mips/vr41xx/nec-cmbvr4133/init.c b/arch/mips/vr41xx/nec-cmbvr4133/init.c index 87f06b3f5a9c..be590edb0b83 100644 --- a/arch/mips/vr41xx/nec-cmbvr4133/init.c +++ b/arch/mips/vr41xx/nec-cmbvr4133/init.c | |||
@@ -16,11 +16,6 @@ | |||
16 | * Manish Lachwani (mlachwani@mvista.com) | 16 | * Manish Lachwani (mlachwani@mvista.com) |
17 | */ | 17 | */ |
18 | #include <linux/config.h> | 18 | #include <linux/config.h> |
19 | #include <linux/init.h> | ||
20 | #include <linux/kernel.h> | ||
21 | #include <linux/string.h> | ||
22 | |||
23 | #include <asm/bootinfo.h> | ||
24 | 19 | ||
25 | #ifdef CONFIG_ROCKHOPPER | 20 | #ifdef CONFIG_ROCKHOPPER |
26 | #include <asm/io.h> | 21 | #include <asm/io.h> |
@@ -28,14 +23,7 @@ | |||
28 | 23 | ||
29 | #define PCICONFDREG 0xaf000c14 | 24 | #define PCICONFDREG 0xaf000c14 |
30 | #define PCICONFAREG 0xaf000c18 | 25 | #define PCICONFAREG 0xaf000c18 |
31 | #endif | ||
32 | |||
33 | const char *get_system_type(void) | ||
34 | { | ||
35 | return "NEC CMB-VR4133"; | ||
36 | } | ||
37 | 26 | ||
38 | #ifdef CONFIG_ROCKHOPPER | ||
39 | void disable_pcnet(void) | 27 | void disable_pcnet(void) |
40 | { | 28 | { |
41 | u32 data; | 29 | u32 data; |
diff --git a/arch/mips/vr41xx/tanbac-tb0226/Makefile b/arch/mips/vr41xx/tanbac-tb0226/Makefile deleted file mode 100644 index 372f953d240b..000000000000 --- a/arch/mips/vr41xx/tanbac-tb0226/Makefile +++ /dev/null | |||
@@ -1,5 +0,0 @@ | |||
1 | # | ||
2 | # Makefile for the TANBAC TB0226 specific parts of the kernel | ||
3 | # | ||
4 | |||
5 | obj-y += setup.o | ||
diff --git a/arch/mips/vr41xx/tanbac-tb0229/Makefile b/arch/mips/vr41xx/tanbac-tb0229/Makefile deleted file mode 100644 index 9c6b864ef2ef..000000000000 --- a/arch/mips/vr41xx/tanbac-tb0229/Makefile +++ /dev/null | |||
@@ -1,5 +0,0 @@ | |||
1 | # | ||
2 | # Makefile for the TANBAC TB0229(VR4131DIMM) specific parts of the kernel | ||
3 | # | ||
4 | |||
5 | obj-y := setup.o | ||
diff --git a/arch/mips/vr41xx/tanbac-tb0229/setup.c b/arch/mips/vr41xx/tanbac-tb0229/setup.c deleted file mode 100644 index 5c1b757bfb0c..000000000000 --- a/arch/mips/vr41xx/tanbac-tb0229/setup.c +++ /dev/null | |||
@@ -1,27 +0,0 @@ | |||
1 | /* | ||
2 | * setup.c, Setup for the TANBAC TB0229 (VR4131DIMM) | ||
3 | * | ||
4 | * Copyright (C) 2002-2005 Yoichi Yuasa <yuasa@hh.iij4u.or.jp> | ||
5 | * | ||
6 | * Modified for TANBAC TB0229: | ||
7 | * Copyright (C) 2003 Megasolution Inc. <matsu@megasolution.jp> | ||
8 | * | ||
9 | * This program is free software; you can redistribute it and/or modify | ||
10 | * it under the terms of the GNU General Public License as published by | ||
11 | * the Free Software Foundation; either version 2 of the License, or | ||
12 | * (at your option) any later version. | ||
13 | * | ||
14 | * This program is distributed in the hope that it will be useful, | ||
15 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
16 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
17 | * GNU General Public License for more details. | ||
18 | * | ||
19 | * You should have received a copy of the GNU General Public License | ||
20 | * along with this program; if not, write to the Free Software | ||
21 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | ||
22 | */ | ||
23 | |||
24 | const char *get_system_type(void) | ||
25 | { | ||
26 | return "TANBAC TB0229"; | ||
27 | } | ||
diff --git a/arch/mips/vr41xx/victor-mpc30x/Makefile b/arch/mips/vr41xx/victor-mpc30x/Makefile deleted file mode 100644 index a2e8086a31a6..000000000000 --- a/arch/mips/vr41xx/victor-mpc30x/Makefile +++ /dev/null | |||
@@ -1,5 +0,0 @@ | |||
1 | # | ||
2 | # Makefile for the Victor MP-C303/304 specific parts of the kernel | ||
3 | # | ||
4 | |||
5 | obj-y += setup.o | ||
diff --git a/arch/mips/vr41xx/victor-mpc30x/setup.c b/arch/mips/vr41xx/victor-mpc30x/setup.c deleted file mode 100644 index f591e36726e6..000000000000 --- a/arch/mips/vr41xx/victor-mpc30x/setup.c +++ /dev/null | |||
@@ -1,24 +0,0 @@ | |||
1 | /* | ||
2 | * setup.c, Setup for the Victor MP-C303/304. | ||
3 | * | ||
4 | * Copyright (C) 2002-2005 Yoichi Yuasa <yuasa@hh.iij4u.or.jp> | ||
5 | * | ||
6 | * This program is free software; you can redistribute it and/or modify | ||
7 | * it under the terms of the GNU General Public License as published by | ||
8 | * the Free Software Foundation; either version 2 of the License, or | ||
9 | * (at your option) any later version. | ||
10 | * | ||
11 | * This program is distributed in the hope that it will be useful, | ||
12 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
13 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
14 | * GNU General Public License for more details. | ||
15 | * | ||
16 | * You should have received a copy of the GNU General Public License | ||
17 | * along with this program; if not, write to the Free Software | ||
18 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | ||
19 | */ | ||
20 | |||
21 | const char *get_system_type(void) | ||
22 | { | ||
23 | return "Victor MP-C303/304"; | ||
24 | } | ||
diff --git a/arch/mips/vr41xx/zao-capcella/Makefile b/arch/mips/vr41xx/zao-capcella/Makefile deleted file mode 100644 index cf420197cd23..000000000000 --- a/arch/mips/vr41xx/zao-capcella/Makefile +++ /dev/null | |||
@@ -1,5 +0,0 @@ | |||
1 | # | ||
2 | # Makefile for the ZAO Networks Capcella specific parts of the kernel | ||
3 | # | ||
4 | |||
5 | obj-y += setup.o | ||
diff --git a/arch/mips/vr41xx/zao-capcella/setup.c b/arch/mips/vr41xx/zao-capcella/setup.c deleted file mode 100644 index 17bade241fe2..000000000000 --- a/arch/mips/vr41xx/zao-capcella/setup.c +++ /dev/null | |||
@@ -1,24 +0,0 @@ | |||
1 | /* | ||
2 | * setup.c, Setup for the ZAO Networks Capcella. | ||
3 | * | ||
4 | * Copyright (C) 2002-2005 Yoichi Yuasa <yuasa@hh.iij4u.or.jp> | ||
5 | * | ||
6 | * This program is free software; you can redistribute it and/or modify | ||
7 | * it under the terms of the GNU General Public License as published by | ||
8 | * the Free Software Foundation; either version 2 of the License, or | ||
9 | * (at your option) any later version. | ||
10 | * | ||
11 | * This program is distributed in the hope that it will be useful, | ||
12 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
13 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
14 | * GNU General Public License for more details. | ||
15 | * | ||
16 | * You should have received a copy of the GNU General Public License | ||
17 | * along with this program; if not, write to the Free Software | ||
18 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | ||
19 | */ | ||
20 | |||
21 | const char *get_system_type(void) | ||
22 | { | ||
23 | return "ZAO Networks Capcella"; | ||
24 | } | ||