Commit 63639ded authored by Paul Mackerras's avatar Paul Mackerras

PPC32: remove code that sets kd_mksound now that it isn't a pointer.

This gets it to compile but leaves us without a keyboard beep on
powermac and APUS for now.
parent 3b2c5daa
...@@ -93,7 +93,6 @@ static void a3000_gettod (int *, int *, int *, int *, int *, int *); ...@@ -93,7 +93,6 @@ static void a3000_gettod (int *, int *, int *, int *, int *, int *);
static void a2000_gettod (int *, int *, int *, int *, int *, int *); static void a2000_gettod (int *, int *, int *, int *, int *, int *);
static int amiga_hwclk (int, struct hwclk_time *); static int amiga_hwclk (int, struct hwclk_time *);
static int amiga_set_clock_mmss (unsigned long); static int amiga_set_clock_mmss (unsigned long);
extern void amiga_mksound( unsigned int count, unsigned int ticks );
#ifdef CONFIG_AMIGA_FLOPPY #ifdef CONFIG_AMIGA_FLOPPY
extern void amiga_floppy_setup(char *, int *); extern void amiga_floppy_setup(char *, int *);
#endif #endif
...@@ -115,8 +114,6 @@ static struct console amiga_console_driver = { ...@@ -115,8 +114,6 @@ static struct console amiga_console_driver = {
index: -1, index: -1,
}; };
extern void (*kd_mksound)(unsigned int, unsigned int);
/* /*
* Motherboard Resources present in all Amiga models * Motherboard Resources present in all Amiga models
...@@ -432,7 +429,6 @@ void __init config_amiga(void) ...@@ -432,7 +429,6 @@ void __init config_amiga(void)
#ifdef CONFIG_DUMMY_CONSOLE #ifdef CONFIG_DUMMY_CONSOLE
conswitchp = &dummy_con; conswitchp = &dummy_con;
#endif #endif
kd_mksound = amiga_mksound;
#ifdef CONFIG_HEARTBEAT #ifdef CONFIG_HEARTBEAT
mach_heartbeat = amiga_heartbeat; mach_heartbeat = amiga_heartbeat;
#endif #endif
......
...@@ -229,17 +229,6 @@ pmac_show_cpuinfo(struct seq_file *m) ...@@ -229,17 +229,6 @@ pmac_show_cpuinfo(struct seq_file *m)
return 0; return 0;
} }
#ifdef CONFIG_VT
/*
* Dummy mksound function that does nothing.
* The real one is in the dmasound driver.
*/
static void __pmac
pmac_mksound(unsigned int hz, unsigned int ticks)
{
}
#endif /* CONFIG_VT */
static volatile u32 *sysctrl_regs; static volatile u32 *sysctrl_regs;
void __init void __init
...@@ -323,9 +312,6 @@ pmac_setup_arch(void) ...@@ -323,9 +312,6 @@ pmac_setup_arch(void)
#ifdef CONFIG_DUMMY_CONSOLE #ifdef CONFIG_DUMMY_CONSOLE
conswitchp = &dummy_con; conswitchp = &dummy_con;
#endif #endif
#ifdef CONFIG_VT
kd_mksound = pmac_mksound;
#endif
#ifdef CONFIG_BLK_DEV_INITRD #ifdef CONFIG_BLK_DEV_INITRD
if (initrd_start) if (initrd_start)
ROOT_DEV = Root_RAM0; ROOT_DEV = Root_RAM0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment