diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1997-07-20 14:56:40 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1997-07-20 14:56:40 +0000 |
| commit | e308faf24f68e262d92d294a01ddca7a17e76762 (patch) | |
| tree | 22c47cb315811834861f013067878ff664e95abd /arch/m68k/amiga/config.c | |
| parent | 30c6397ce63178fcb3e7963ac247f0a03132aca9 (diff) | |
Sync with Linux 2.1.46.
Diffstat (limited to 'arch/m68k/amiga/config.c')
| -rw-r--r-- | arch/m68k/amiga/config.c | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/arch/m68k/amiga/config.c b/arch/m68k/amiga/config.c index e36016306..1571e1a0f 100644 --- a/arch/m68k/amiga/config.c +++ b/arch/m68k/amiga/config.c @@ -85,6 +85,7 @@ static void amiga_serial_console_write(const char *s, unsigned int count); static void amiga_debug_init(void); extern void amiga_video_setup(char *, int *); +extern void amiga_init_sound(void); static struct console amiga_console_driver = { NULL, NULL, amiga_wait_key @@ -799,14 +800,18 @@ void amiga_serial_gets(char *s, int len) __initfunc(static void amiga_debug_init(void)) { - if (!strcmp( m68k_debug_device, "ser" )) { - /* no initialization required (?) */ - amiga_console_driver.write = amiga_serial_console_write; - } else if (!strcmp( m68k_debug_device, "mem" )) { - amiga_savekmsg_init(); - amiga_console_driver.write = amiga_mem_console_write; - } - register_console(&amiga_console_driver); + if (!strcmp( m68k_debug_device, "ser" )) { + /* no initialization required (?) */ + amiga_console_driver.write = amiga_serial_console_write; + } else if (!strcmp( m68k_debug_device, "mem" )) { + amiga_savekmsg_init(); + amiga_console_driver.write = amiga_mem_console_write; + } + register_console(&amiga_console_driver); + + /* our beloved beeper */ + if (AMIGAHW_PRESENT(AMI_AUDIO)) + amiga_init_sound(); } |