Module Name: src
Committed By: macallan
Date: Sun May 12 13:23:08 UTC 2013
Modified Files:
src/sys/arch/powerpc/oea: ofw_autoconf.c ofw_consinit.c
Log Message:
move console_node and console_instance to ofw_consinit.c where they're
actually used
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/powerpc/oea/ofw_autoconf.c
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/powerpc/oea/ofw_consinit.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/powerpc/oea/ofw_autoconf.c
diff -u src/sys/arch/powerpc/oea/ofw_autoconf.c:1.18 src/sys/arch/powerpc/oea/ofw_autoconf.c:1.19
--- src/sys/arch/powerpc/oea/ofw_autoconf.c:1.18 Sun Apr 28 00:44:27 2013
+++ src/sys/arch/powerpc/oea/ofw_autoconf.c Sun May 12 13:23:08 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: ofw_autoconf.c,v 1.18 2013/04/28 00:44:27 macallan Exp $ */
+/* $NetBSD: ofw_autoconf.c,v 1.19 2013/05/12 13:23:08 macallan Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
* Copyright (C) 1995, 1996 TooLs GmbH.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ofw_autoconf.c,v 1.18 2013/04/28 00:44:27 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ofw_autoconf.c,v 1.19 2013/05/12 13:23:08 macallan Exp $");
#ifdef ofppc
#include "gtpci.h"
@@ -67,7 +67,6 @@ __KERNEL_RCSID(0, "$NetBSD: ofw_autoconf
extern char bootpath[256];
char cbootpath[256];
-int console_node = 0, console_instance = 0;
static void canonicalize_bootpath(void);
Index: src/sys/arch/powerpc/oea/ofw_consinit.c
diff -u src/sys/arch/powerpc/oea/ofw_consinit.c:1.15 src/sys/arch/powerpc/oea/ofw_consinit.c:1.16
--- src/sys/arch/powerpc/oea/ofw_consinit.c:1.15 Mon Oct 29 12:52:43 2012
+++ src/sys/arch/powerpc/oea/ofw_consinit.c Sun May 12 13:23:08 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: ofw_consinit.c,v 1.15 2012/10/29 12:52:43 chs Exp $ */
+/* $NetBSD: ofw_consinit.c,v 1.16 2013/05/12 13:23:08 macallan Exp $ */
/*-
* Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ofw_consinit.c,v 1.15 2012/10/29 12:52:43 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ofw_consinit.c,v 1.16 2013/05/12 13:23:08 macallan Exp $");
#include <sys/param.h>
#include <sys/buf.h>
@@ -88,7 +88,7 @@ extern struct consdev consdev_zs;
#include <dev/ic/pckbcvar.h>
#endif
-extern int console_node, console_instance;
+int console_node = 0, console_instance = 0;
int chosen, stdin, stdout;
int ofkbd_ihandle;
