From 6a02242cf5a8c2af2b3cf5da4c3760b332924740 Mon Sep 17 00:00:00 2001
From: Ralf Baechle <ralf@linux-mips.org>
Date: Mon, 19 Mar 2001 21:29:47 +0000
Subject: Fix Origin after recent ARC changes.

---
 arch/mips64/arc/arc_con.c           | 12 +++++++++++-
 arch/mips64/arc/console.c           |  8 --------
 arch/mips64/sgi-ip27/ip27-console.c |  3 ++-
 3 files changed, 13 insertions(+), 10 deletions(-)

(limited to 'arch/mips64')

diff --git a/arch/mips64/arc/arc_con.c b/arch/mips64/arc/arc_con.c
index 6fe94a6c7..3569c37de 100644
--- a/arch/mips64/arc/arc_con.c
+++ b/arch/mips64/arc/arc_con.c
@@ -3,8 +3,8 @@
  * ARC io-routines.
  *
  * Copyright (c) 1998 Harald Koerfgen 
+ * Copyright (c) 2001 Ralf Baechle
  */
-
 #include <linux/tty.h>
 #include <linux/major.h>
 #include <linux/ptrace.h>
@@ -12,9 +12,19 @@
 #include <linux/console.h>
 #include <linux/fs.h>
 
+#include <asm/sgialib.h>
+
 extern char prom_getchar (void);
 extern void prom_printf (char *, ...);
 
+void prom_putchar(char c)
+{
+	ULONG cnt;
+	CHAR it = c;
+
+	ArcWrite(1, &it, 1, &cnt);
+}
+
 static void prom_console_write(struct console *co, const char *s,
 			       unsigned count)
 {
diff --git a/arch/mips64/arc/console.c b/arch/mips64/arc/console.c
index 2edda7fff..fbba5d5d9 100644
--- a/arch/mips64/arc/console.c
+++ b/arch/mips64/arc/console.c
@@ -9,14 +9,6 @@
 #include <linux/kernel.h>
 #include <asm/sgialib.h>
 
-static inline void prom_putchar(char c)
-{
-	ULONG cnt;
-	CHAR it = c;
-
-	ArcWrite(1, &it, 1, &cnt);
-}
-
 static char ppbuf[1024];
 
 void prom_printf(char *fmt, ...)
diff --git a/arch/mips64/sgi-ip27/ip27-console.c b/arch/mips64/sgi-ip27/ip27-console.c
index fa3ffb1cb..3fdacdd06 100644
--- a/arch/mips64/sgi-ip27/ip27-console.c
+++ b/arch/mips64/sgi-ip27/ip27-console.c
@@ -2,6 +2,8 @@
  * This file is subject to the terms and conditions of the GNU General Public
  * License.  See the file "COPYING" in the main directory of this archive
  * for more details.
+ *
+ * Copyright (C) 2001 Ralf Baechle
  */
 #include <linux/init.h>
 #include <linux/console.h>
@@ -11,7 +13,6 @@
 #include <asm/sn/sn0/hub.h>
 #include <asm/sn/klconfig.h>
 #include <asm/sn/ioc3.h>
-#include <asm/sgialib.h>
 #include <asm/sn/sn_private.h>
 
 void prom_putchar(char c)
-- 
cgit v1.2.3