aboutsummaryrefslogtreecommitdiffstats
path: root/sound/oss/dmasound/dmasound_paula.c
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2006-10-05 21:03:43 -0400
committerJeff Garzik <jeff@garzik.org>2006-10-05 21:03:43 -0400
commit4ad99f15c6a3cadf36928c399459ea4fdb3d49f9 (patch)
treed0536e4da737900fa27b235f175a3d179d692200 /sound/oss/dmasound/dmasound_paula.c
parent46767aeba58ca9357a2309765201bad38d8f5e9b (diff)
parent44aefd2706bb6f5b65ba2c38cd89e7609e2b43d3 (diff)
Merge branch 'master' into upstream-fixes
Diffstat (limited to 'sound/oss/dmasound/dmasound_paula.c')
-rw-r--r--sound/oss/dmasound/dmasound_paula.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/oss/dmasound/dmasound_paula.c b/sound/oss/dmasound/dmasound_paula.c
index 68e1d8f6c359..90fc058e1159 100644
--- a/sound/oss/dmasound/dmasound_paula.c
+++ b/sound/oss/dmasound/dmasound_paula.c
@@ -82,7 +82,7 @@ static int AmiSetVolume(int volume);
82static int AmiSetTreble(int treble); 82static int AmiSetTreble(int treble);
83static void AmiPlayNextFrame(int index); 83static void AmiPlayNextFrame(int index);
84static void AmiPlay(void); 84static void AmiPlay(void);
85static irqreturn_t AmiInterrupt(int irq, void *dummy, struct pt_regs *fp); 85static irqreturn_t AmiInterrupt(int irq, void *dummy);
86 86
87#ifdef CONFIG_HEARTBEAT 87#ifdef CONFIG_HEARTBEAT
88 88
@@ -556,7 +556,7 @@ static void AmiPlay(void)
556} 556}
557 557
558 558
559static irqreturn_t AmiInterrupt(int irq, void *dummy, struct pt_regs *fp) 559static irqreturn_t AmiInterrupt(int irq, void *dummy)
560{ 560{
561 int minframes = 1; 561 int minframes = 1;
562 562