diff options
author | Paul Bolle <pebolle@tiscali.nl> | 2013-05-30 05:20:15 -0400 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2013-06-17 18:31:29 -0400 |
commit | 9601cd159565fa228edc8e5ea3ed2c0ac3fb4d1f (patch) | |
tree | 249601bb2529c678b2ca47b3a7f012c46d6456cf | |
parent | 0e6ecc1a9aa7cbf991d9711a12cae2b4853ef718 (diff) |
MIPS: DEC: remove unbuildable promcon.c
promcon.o is built if CONFIG_PROM_CONSOLE is set. But there's no Kconfig
symbol PROM_CONSOLE, so promcon.c is unbuildable. Remove it.
Signed-off-by: Paul Bolle <pebolle@tiscali.nl>
Acked-by: Maciej W. Rozycki <macro@linux-mips.org>
Cc: linux-mips@linux-mips.org
Cc: linux-kernel@vger.kernel.org
Patchwork: https://patchwork.linux-mips.org/patch/5344/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
-rw-r--r-- | arch/mips/dec/Makefile | 1 | ||||
-rw-r--r-- | arch/mips/dec/promcon.c | 54 |
2 files changed, 0 insertions, 55 deletions
diff --git a/arch/mips/dec/Makefile b/arch/mips/dec/Makefile index 9eb2f9c036aa..3d5d2c56de8d 100644 --- a/arch/mips/dec/Makefile +++ b/arch/mips/dec/Makefile | |||
@@ -5,6 +5,5 @@ | |||
5 | obj-y := ecc-berr.o int-handler.o ioasic-irq.o kn01-berr.o \ | 5 | obj-y := ecc-berr.o int-handler.o ioasic-irq.o kn01-berr.o \ |
6 | kn02-irq.o kn02xa-berr.o reset.o setup.o time.o | 6 | kn02-irq.o kn02xa-berr.o reset.o setup.o time.o |
7 | 7 | ||
8 | obj-$(CONFIG_PROM_CONSOLE) += promcon.o | ||
9 | obj-$(CONFIG_TC) += tc.o | 8 | obj-$(CONFIG_TC) += tc.o |
10 | obj-$(CONFIG_CPU_HAS_WB) += wbflush.o | 9 | obj-$(CONFIG_CPU_HAS_WB) += wbflush.o |
diff --git a/arch/mips/dec/promcon.c b/arch/mips/dec/promcon.c deleted file mode 100644 index c239c25b79ff..000000000000 --- a/arch/mips/dec/promcon.c +++ /dev/null | |||
@@ -1,54 +0,0 @@ | |||
1 | /* | ||
2 | * Wrap-around code for a console using the | ||
3 | * DECstation PROM io-routines. | ||
4 | * | ||
5 | * Copyright (c) 1998 Harald Koerfgen | ||
6 | */ | ||
7 | |||
8 | #include <linux/tty.h> | ||
9 | #include <linux/ptrace.h> | ||
10 | #include <linux/init.h> | ||
11 | #include <linux/console.h> | ||
12 | #include <linux/fs.h> | ||
13 | |||
14 | #include <asm/dec/prom.h> | ||
15 | |||
16 | static void prom_console_write(struct console *co, const char *s, | ||
17 | unsigned count) | ||
18 | { | ||
19 | unsigned i; | ||
20 | |||
21 | /* | ||
22 | * Now, do each character | ||
23 | */ | ||
24 | for (i = 0; i < count; i++) { | ||
25 | if (*s == 10) | ||
26 | prom_printf("%c", 13); | ||
27 | prom_printf("%c", *s++); | ||
28 | } | ||
29 | } | ||
30 | |||
31 | static int __init prom_console_setup(struct console *co, char *options) | ||
32 | { | ||
33 | return 0; | ||
34 | } | ||
35 | |||
36 | static struct console sercons = { | ||
37 | .name = "ttyS", | ||
38 | .write = prom_console_write, | ||
39 | .setup = prom_console_setup, | ||
40 | .flags = CON_PRINTBUFFER, | ||
41 | .index = -1, | ||
42 | }; | ||
43 | |||
44 | /* | ||
45 | * Register console. | ||
46 | */ | ||
47 | |||
48 | static int __init prom_console_init(void) | ||
49 | { | ||
50 | register_console(&sercons); | ||
51 | |||
52 | return 0; | ||
53 | } | ||
54 | console_initcall(prom_console_init); | ||