diff options
Diffstat (limited to 'arch/m68k/sun3x/prom.c')
-rw-r--r-- | arch/m68k/sun3x/prom.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/arch/m68k/sun3x/prom.c b/arch/m68k/sun3x/prom.c index f23d4255a6fa..48f8eb7b1565 100644 --- a/arch/m68k/sun3x/prom.c +++ b/arch/m68k/sun3x/prom.c | |||
@@ -73,8 +73,6 @@ void sun3x_reboot(void) | |||
73 | (*romvec->pv_reboot)("vmlinux"); | 73 | (*romvec->pv_reboot)("vmlinux"); |
74 | } | 74 | } |
75 | 75 | ||
76 | extern char m68k_debug_device[]; | ||
77 | |||
78 | static void sun3x_prom_write(struct console *co, const char *s, | 76 | static void sun3x_prom_write(struct console *co, const char *s, |
79 | unsigned int count) | 77 | unsigned int count) |
80 | { | 78 | { |
@@ -119,13 +117,18 @@ void sun3x_prom_init(void) | |||
119 | * XXX this is futile since we restore the vbr first - oops | 117 | * XXX this is futile since we restore the vbr first - oops |
120 | */ | 118 | */ |
121 | vectors[VEC_TRAP14] = sun3x_prom_abort; | 119 | vectors[VEC_TRAP14] = sun3x_prom_abort; |
120 | } | ||
122 | 121 | ||
122 | static int __init sun3x_debug_setup(char *arg) | ||
123 | { | ||
123 | /* If debug=prom was specified, start the debug console */ | 124 | /* If debug=prom was specified, start the debug console */ |
124 | 125 | if (MACH_IS_SUN3X && !strcmp(arg, "prom")) | |
125 | if (!strcmp(m68k_debug_device, "prom")) | ||
126 | register_console(&sun3x_debug); | 126 | register_console(&sun3x_debug); |
127 | return 0; | ||
127 | } | 128 | } |
128 | 129 | ||
130 | early_param("debug", sun3x_debug_setup); | ||
131 | |||
129 | /* some prom functions to export */ | 132 | /* some prom functions to export */ |
130 | int prom_getintdefault(int node, char *property, int deflt) | 133 | int prom_getintdefault(int node, char *property, int deflt) |
131 | { | 134 | { |