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.

diff --git a/arch/ppc/amiga/config.c b/arch/ppc/amiga/config.c
index d7cbddef505e2286d269e1aca8791009cb504b5e..59bf5d52bbd5988299a9bf2104a0969ef1d8fea9 100644 (file)
--- a/arch/ppc/amiga/config.c
+++ b/arch/ppc/amiga/config.c
@@ -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 int amiga_hwclk (int, struct hwclk_time *);
 static int amiga_set_clock_mmss (unsigned long);
-extern void amiga_mksound( unsigned int count, unsigned int ticks );
 #ifdef CONFIG_AMIGA_FLOPPY
 extern void amiga_floppy_setup(char *, int *);
 #endif
@@ -115,8 +114,6 @@ static struct console amiga_console_driver = {
        index:          -1,
 };
 
-extern void (*kd_mksound)(unsigned int, unsigned int);
-
 
     /*
      *  Motherboard Resources present in all Amiga models
@@ -432,7 +429,6 @@ void __init config_amiga(void)
 #ifdef CONFIG_DUMMY_CONSOLE
   conswitchp           = &dummy_con;
 #endif
-  kd_mksound           = amiga_mksound;
 #ifdef CONFIG_HEARTBEAT
   mach_heartbeat = amiga_heartbeat;
 #endif

diff --git a/arch/ppc/platforms/pmac_setup.c b/arch/ppc/platforms/pmac_setup.c
index 2a67289aa06eadefea429c9723065b8b408f8f78..7f59b42ebd0d627e5e3ead45d19df757033a499b 100644 (file)
--- a/arch/ppc/platforms/pmac_setup.c
+++ b/arch/ppc/platforms/pmac_setup.c
@@ -229,17 +229,6 @@ pmac_show_cpuinfo(struct seq_file *m)
        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;
 
 void __init
@@ -323,9 +312,6 @@ pmac_setup_arch(void)
 #ifdef CONFIG_DUMMY_CONSOLE
        conswitchp = &dummy_con;
 #endif
-#ifdef CONFIG_VT
-       kd_mksound = pmac_mksound;
-#endif
 #ifdef CONFIG_BLK_DEV_INITRD
        if (initrd_start)
                ROOT_DEV = Root_RAM0;