diff options
author | Adrian Bunk <bunk@kernel.org> | 2008-07-17 15:16:15 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-20 20:24:38 -0400 |
commit | d33b4432e634246eef00ef4d425939c253f70dd6 (patch) | |
tree | cc559629a904ea8be1dba5cd4e8718ed1691e8e7 /arch | |
parent | b739912efc02f80cc4dc5eaef07e5bc7eafee1b0 (diff) |
m68k: remove AP1000 code
Unless I miss something that's code for a sparc machine even the sparc
code no longer supports that got copied to m68k when these files were
copied.
Signed-off-by: Adrian Bunk <bunk@kernel.org>
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/m68k/sun3/prom/console.c | 4 | ||||
-rw-r--r-- | arch/m68k/sun3/prom/init.c | 9 | ||||
-rw-r--r-- | arch/m68k/sun3/prom/printf.c | 5 |
3 files changed, 0 insertions, 18 deletions
diff --git a/arch/m68k/sun3/prom/console.c b/arch/m68k/sun3/prom/console.c index 5812560b70f8..2bcb6e4bfe54 100644 --- a/arch/m68k/sun3/prom/console.c +++ b/arch/m68k/sun3/prom/console.c | |||
@@ -104,8 +104,6 @@ prom_query_input_device() | |||
104 | return PROMDEV_ITTYB; | 104 | return PROMDEV_ITTYB; |
105 | } | 105 | } |
106 | return PROMDEV_I_UNK; | 106 | return PROMDEV_I_UNK; |
107 | case PROM_AP1000: | ||
108 | return PROMDEV_I_UNK; | ||
109 | }; | 107 | }; |
110 | } | 108 | } |
111 | #endif | 109 | #endif |
@@ -166,8 +164,6 @@ prom_query_output_device() | |||
166 | }; | 164 | }; |
167 | } | 165 | } |
168 | break; | 166 | break; |
169 | case PROM_AP1000: | ||
170 | return PROMDEV_I_UNK; | ||
171 | }; | 167 | }; |
172 | return PROMDEV_O_UNK; | 168 | return PROMDEV_O_UNK; |
173 | } | 169 | } |
diff --git a/arch/m68k/sun3/prom/init.c b/arch/m68k/sun3/prom/init.c index 5f85681af5aa..d8e6349336b4 100644 --- a/arch/m68k/sun3/prom/init.c +++ b/arch/m68k/sun3/prom/init.c | |||
@@ -31,11 +31,6 @@ extern void prom_ranges_init(void); | |||
31 | 31 | ||
32 | void __init prom_init(struct linux_romvec *rp) | 32 | void __init prom_init(struct linux_romvec *rp) |
33 | { | 33 | { |
34 | #ifdef CONFIG_AP1000 | ||
35 | extern struct linux_romvec *ap_prom_init(void); | ||
36 | rp = ap_prom_init(); | ||
37 | #endif | ||
38 | |||
39 | romvec = rp; | 34 | romvec = rp; |
40 | #ifndef CONFIG_SUN3 | 35 | #ifndef CONFIG_SUN3 |
41 | switch(romvec->pv_romvers) { | 36 | switch(romvec->pv_romvers) { |
@@ -53,10 +48,6 @@ void __init prom_init(struct linux_romvec *rp) | |||
53 | prom_printf("PROMLIB: Sun IEEE Prom not supported yet\n"); | 48 | prom_printf("PROMLIB: Sun IEEE Prom not supported yet\n"); |
54 | prom_halt(); | 49 | prom_halt(); |
55 | break; | 50 | break; |
56 | case 42: /* why not :-) */ | ||
57 | prom_vers = PROM_AP1000; | ||
58 | break; | ||
59 | |||
60 | default: | 51 | default: |
61 | prom_printf("PROMLIB: Bad PROM version %d\n", | 52 | prom_printf("PROMLIB: Bad PROM version %d\n", |
62 | romvec->pv_romvers); | 53 | romvec->pv_romvers); |
diff --git a/arch/m68k/sun3/prom/printf.c b/arch/m68k/sun3/prom/printf.c index c8cf98d97f2e..df85018f487a 100644 --- a/arch/m68k/sun3/prom/printf.c +++ b/arch/m68k/sun3/prom/printf.c | |||
@@ -37,10 +37,6 @@ prom_printf(char *fmt, ...) | |||
37 | 37 | ||
38 | bptr = ppbuf; | 38 | bptr = ppbuf; |
39 | 39 | ||
40 | #ifdef CONFIG_AP1000 | ||
41 | ap_write(1,bptr,strlen(bptr)); | ||
42 | #else | ||
43 | |||
44 | #ifdef CONFIG_KGDB | 40 | #ifdef CONFIG_KGDB |
45 | if (kgdb_initialized) { | 41 | if (kgdb_initialized) { |
46 | printk("kgdb_initialized = %d\n", kgdb_initialized); | 42 | printk("kgdb_initialized = %d\n", kgdb_initialized); |
@@ -54,7 +50,6 @@ prom_printf(char *fmt, ...) | |||
54 | prom_putchar(ch); | 50 | prom_putchar(ch); |
55 | } | 51 | } |
56 | #endif | 52 | #endif |
57 | #endif | ||
58 | va_end(args); | 53 | va_end(args); |
59 | return; | 54 | return; |
60 | } | 55 | } |