From: Paul M. <le...@us...> - 2002-04-21 18:03:14
|
Update of /cvsroot/linux-mips/linux/arch/mips/ddb5xxx/common In directory usw-pr-cvs1:/tmp/cvs-serv9425/arch/mips/ddb5xxx/common Modified Files: prom.c Log Message: Sync with OSS. Index: prom.c =================================================================== RCS file: /cvsroot/linux-mips/linux/arch/mips/ddb5xxx/common/prom.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- prom.c 22 Jan 2002 22:08:12 -0000 1.5 +++ prom.c 21 Apr 2002 18:03:11 -0000 1.6 @@ -28,13 +28,12 @@ const char *get_system_type(void) { -#if defined(CONFIG_DDB5074) - return "NEC DDB Vrc-5074"; -#elif defined(CONFIG_DDB5476) - return "NEC DDB Vrc-5476"; -#elif defined(CONFIG_DDB5477) - return "NEC DDB Vrc-5477"; -#endif + switch (mips_machtype) { + case MACH_NEC_DDB5074: return "NEC DDB Vrc-5074"; + case MACH_NEC_DDB5476: return "NEC DDB Vrc-5476"; + case MACH_NEC_DDB5477: return "NEC DDB Vrc-5477"; + case MACH_NEC_ROCKHOPPER: return "NEC Rockhopper"; + } } /* [js...@ju...] PMON passes arguments in C main() style */ |