Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8bb670c1 authored by Yoichi Yuasa's avatar Yoichi Yuasa Committed by Linus Torvalds
Browse files

[PATCH] mips: change system type name in proc for vr41xx 



This patch has changed system type name in proc for vr41xx.

Signed-off-by: default avatarYoichi Yuasa <yuasa@hh.iij4u.or.jp>
Cc: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 979934da

arch/mips/Makefile

+0 −4
Original line number Diff line number Diff line
@@ -490,13 +490,11 @@ load-$(CONFIG_NEC_CMBVR4133) += 0xffffffff80100000 
#

# ZAO Networks Capcella (VR4131)

#

core-$(CONFIG_ZAO_CAPCELLA)	+= arch/mips/vr41xx/zao-capcella/

load-$(CONFIG_ZAO_CAPCELLA)	+= 0xffffffff80000000



#

# Victor MP-C303/304 (VR4122)

#

core-$(CONFIG_VICTOR_MPC30X)	+= arch/mips/vr41xx/victor-mpc30x/

load-$(CONFIG_VICTOR_MPC30X)	+= 0xffffffff80001000



#
@@ -514,13 +512,11 @@ load-$(CONFIG_CASIO_E55) += 0xffffffff80004000 
#

# TANBAC TB0226 Mbase (VR4131)

#

core-$(CONFIG_TANBAC_TB0226)	+= arch/mips/vr41xx/tanbac-tb0226/

load-$(CONFIG_TANBAC_TB0226)	+= 0xffffffff80000000



#

# TANBAC TB0229 VR4131DIMM (VR4131)

#

core-$(CONFIG_TANBAC_TB0229)	+= arch/mips/vr41xx/tanbac-tb0229/

load-$(CONFIG_TANBAC_TB0229)	+= 0xffffffff80000000



#

arch/mips/vr41xx/casio-e55/setup.c

+0 −5
Original line number Diff line number Diff line
@@ -23,11 +23,6 @@ 
#include <asm/io.h>

#include <asm/vr41xx/e55.h>



const char *get_system_type(void)

{

	return "CASIO CASSIOPEIA E-11/15/55/65";

}



static int __init casio_e55_setup(void)

{

	set_io_port_base(IO_PORT_BASE);

arch/mips/vr41xx/common/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
# Makefile for common code of the NEC VR4100 series.

#



obj-y				+= bcu.o cmu.o icu.o init.o int-handler.o irq.o pmu.o

obj-y				+= bcu.o cmu.o icu.o init.o int-handler.o irq.o pmu.o type.o

obj-$(CONFIG_VRC4173)		+= vrc4173.o



EXTRA_AFLAGS := $(CFLAGS)

arch/mips/vr41xx/tanbac-tb0226/setup.c→arch/mips/vr41xx/common/type.c

+3 −3
Original line number Diff line number Diff line 
/*

 *  setup.c, Setup for the TANBAC TB0226.

 *  type.c, System type for NEC VR4100 series.

 *

 *  Copyright (C) 2002-2005  Yoichi Yuasa <yuasa@hh.iij4u.or.jp>

 *  Copyright (C) 2005  Yoichi Yuasa <yuasa@hh.iij4u.or.jp>

 *

 *  This program is free software; you can redistribute it and/or modify

 *  it under the terms of the GNU General Public License as published by
@@ -20,5 +20,5 @@ 


const char *get_system_type(void)

{

	return "TANBAC TB0226";

	return "NEC VR4100 series";

}

arch/mips/vr41xx/ibm-workpad/setup.c

+0 −5
Original line number Diff line number Diff line
@@ -23,11 +23,6 @@ 
#include <asm/io.h>

#include <asm/vr41xx/workpad.h>



const char *get_system_type(void)

{

	return "IBM WorkPad z50";

}



static int __init ibm_workpad_setup(void)

{

	set_io_port_base(IO_PORT_BASE);