diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2000-08-27 00:03:21 +0000 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2000-08-27 00:03:21 +0000 |
commit | 20fa7e4ec02342c73bec73511be611ff0b46bf68 (patch) | |
tree | 2ca54a6bf83c9e1239160663c783b9660a1d720c /arch/mips64/arc | |
parent | 3a2ae21f6fc1c3a4dcd6c247b818682f562d6a90 (diff) |
Desinfect console code from #ifdefmania.
Diffstat (limited to 'arch/mips64/arc')
-rw-r--r-- | arch/mips64/arc/Makefile | 1 | ||||
-rw-r--r-- | arch/mips64/arc/console.c | 30 |
2 files changed, 1 insertions, 30 deletions
diff --git a/arch/mips64/arc/Makefile b/arch/mips64/arc/Makefile index 039caf88d..ca655299f 100644 --- a/arch/mips64/arc/Makefile +++ b/arch/mips64/arc/Makefile @@ -1,4 +1,3 @@ -# $Id: Makefile,v 1.1 1999/08/20 21:13:32 ralf Exp $ # # Makefile for the ARC prom monitor library routines under Linux. # diff --git a/arch/mips64/arc/console.c b/arch/mips64/arc/console.c index 6d6442799..31af388dc 100644 --- a/arch/mips64/arc/console.c +++ b/arch/mips64/arc/console.c @@ -1,39 +1,13 @@ -/* $Id: console.c,v 1.3 1999/10/19 20:51:44 ralf Exp $ - * +/* * 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. * - * ARC console code. - * * Copyright (C) 1996 David S. Miller (dm@sgi.com) */ -#include <linux/config.h> #include <linux/init.h> #include <asm/sgialib.h> -#ifdef CONFIG_SGI_IP27 - -#include <asm/sn/addrs.h> -#include <asm/sn/sn0/hub.h> -#include <asm/sn/klconfig.h> -#include <asm/ioc3.h> -#include <asm/sn/sn_private.h> - -void prom_putchar(char c) -{ - struct ioc3 *ioc3; - struct ioc3_uartregs *uart; - - ioc3 = (struct ioc3 *)KL_CONFIG_CH_CONS_INFO(master_nasid)->memory_base; - uart = &ioc3->sregs.uarta; - - while ((uart->iu_lsr & 0x20) == 0); - uart->iu_thr = c; -} - -#else /* CONFIG_SGI_IP27 */ - void prom_putchar(char c) { ULONG cnt; @@ -42,8 +16,6 @@ void prom_putchar(char c) ArcWrite(1, &it, 1, &cnt); } -#endif /* CONFIG_SGI_IP27 */ - char __init prom_getchar(void) { ULONG cnt; |