aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKees Cook <keescook@chromium.org>2017-11-23 14:19:02 -0800
committerThomas Gleixner <tglx@linutronix.de>2017-11-24 16:19:40 +0100
commit54b8a2306b928abca4d3e9d7e2c17a4673032e1c (patch)
tree0c87955d4e586309db2080b0171cd9c0ef8e9461
parent866c9b94ef968445c52214b3748ecc52a8491bca (diff)
m68k/macboing: Fix missed timer callback assignment
This fixes a missed function prototype callback from the timer conversions. Reported-by: kbuild test robot <fengguang.wu@intel.com> Signed-off-by: Kees Cook <keescook@chromium.org> Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Link: https://lkml.kernel.org/r/20171123221902.GA75727@beast
-rw-r--r--arch/m68k/mac/macboing.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/m68k/mac/macboing.c b/arch/m68k/mac/macboing.c
index 135a87bbd1a2..388780797f7d 100644
--- a/arch/m68k/mac/macboing.c
+++ b/arch/m68k/mac/macboing.c
@@ -50,7 +50,7 @@ static unsigned long mac_bell_phasepersample;
static void mac_init_asc( void );
static void mac_nosound(struct timer_list *);
static void mac_quadra_start_bell( unsigned int, unsigned int, unsigned int );
-static void mac_quadra_ring_bell( unsigned long );
+static void mac_quadra_ring_bell(struct timer_list *);
static void mac_av_start_bell( unsigned int, unsigned int, unsigned int );
static void ( *mac_special_bell )( unsigned int, unsigned int, unsigned int );
@@ -270,7 +270,7 @@ static void mac_quadra_start_bell( unsigned int freq, unsigned int length, unsig
* already load the wave table, or at least call this one...
* This piece keeps reloading the wave table until done.
*/
-static void mac_quadra_ring_bell( unsigned long ignored )
+static void mac_quadra_ring_bell(struct timer_list *unused)
{
int i, count = mac_asc_samplespersec / HZ;
unsigned long flags;

Privacy Policy