summaryrefslogtreecommitdiffstats
path: root/sound/oss/pas2_card.c
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2006-10-11 03:56:12 -0400
committerJeff Garzik <jeff@garzik.org>2006-10-11 03:56:12 -0400
commit24fcbacedb0d83cabc6761acbecfbf751265ce52 (patch)
tree7147b206304b028c3cfd5de6317e5c8510098ca9 /sound/oss/pas2_card.c
parent2f614fe04f4463ff22234133319067d7361f54e5 (diff)
parent53a5fbdc2dff55161a206ed1a1385a8fa8055c34 (diff)
downloadop-kernel-dev-24fcbacedb0d83cabc6761acbecfbf751265ce52.zip
op-kernel-dev-24fcbacedb0d83cabc6761acbecfbf751265ce52.tar.gz
Merge branch 'master' into upstream-fixes
Diffstat (limited to 'sound/oss/pas2_card.c')
-rw-r--r--sound/oss/pas2_card.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/oss/pas2_card.c b/sound/oss/pas2_card.c
index 4ebb963..25f3a22 100644
--- a/sound/oss/pas2_card.c
+++ b/sound/oss/pas2_card.c
@@ -88,7 +88,7 @@ void pas_write(unsigned char data, int ioaddr)
/******************* Begin of the Interrupt Handler ********************/
-static irqreturn_t pasintr(int irq, void *dev_id, struct pt_regs *dummy)
+static irqreturn_t pasintr(int irq, void *dev_id)
{
int status;
OpenPOWER on IntegriCloud