"machine_model" is now declared in machine/autoconf.h.

This commit is contained in:
nakayama 2013-11-08 15:44:26 +00:00
parent 1f5dbc945b
commit 30bd626232
2 changed files with 4 additions and 6 deletions

View File

@ -1,4 +1,4 @@
/* $NetBSD: psycho.c,v 1.116 2013/09/24 18:23:07 jdc Exp $ */
/* $NetBSD: psycho.c,v 1.117 2013/11/08 15:44:26 nakayama Exp $ */
/*
* Copyright (c) 1999, 2000 Matthew R. Green
@ -55,7 +55,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: psycho.c,v 1.116 2013/09/24 18:23:07 jdc Exp $");
__KERNEL_RCSID(0, "$NetBSD: psycho.c,v 1.117 2013/11/08 15:44:26 nakayama Exp $");
#include "opt_ddb.h"
@ -303,7 +303,6 @@ psycho_attach(device_t parent, device_t self, void *aux)
int psycho_br[2], n, i;
bus_space_handle_t pci_ctl;
char *model = prom_getpropstring(ma->ma_node, "model");
extern char machine_model[];
aprint_normal("\n");

View File

@ -1,4 +1,4 @@
/* $NetBSD: cpu.c,v 1.104 2013/08/20 19:19:23 macallan Exp $ */
/* $NetBSD: cpu.c,v 1.105 2013/11/08 15:44:26 nakayama Exp $ */
/*
* Copyright (c) 1996
@ -52,7 +52,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.104 2013/08/20 19:19:23 macallan Exp $");
__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.105 2013/11/08 15:44:26 nakayama Exp $");
#include "opt_multiprocessor.h"
@ -92,7 +92,6 @@ static struct cpu_info *alloc_cpuinfo(u_int);
char machine[] = MACHINE; /* from <machine/param.h> */
char machine_arch[] = MACHINE_ARCH; /* from <machine/param.h> */
char cpu_model[100]; /* machine model (primary CPU) */
extern char machine_model[];
/* These are used in locore.s, and are maximums */
int dcache_line_size;