summaryrefslogtreecommitdiff
path: root/linux/sound
diff options
context:
space:
mode:
Diffstat (limited to 'linux/sound')
-rw-r--r--linux/sound/oss/btaudio.c4
-rw-r--r--linux/sound/pci/bt87x.c4
2 files changed, 8 insertions, 0 deletions
diff --git a/linux/sound/oss/btaudio.c b/linux/sound/oss/btaudio.c
index 1a0e427ce..82aeb950d 100644
--- a/linux/sound/oss/btaudio.c
+++ b/linux/sound/oss/btaudio.c
@@ -833,7 +833,11 @@ static char *irq_name[] = { "", "", "", "OFLOW", "", "", "", "", "", "", "",
"RISCI", "FBUS", "FTRGT", "FDSR", "PPERR",
"RIPERR", "PABORT", "OCERR", "SCERR" };
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19)
static irqreturn_t btaudio_irq(int irq, void *dev_id, struct pt_regs * regs)
+#else
+static irqreturn_t btaudio_irq(int irq, void *dev_id)
+#endif
{
int count = 0;
u32 stat,astat;
diff --git a/linux/sound/pci/bt87x.c b/linux/sound/pci/bt87x.c
index 65888ed3c..760c40277 100644
--- a/linux/sound/pci/bt87x.c
+++ b/linux/sound/pci/bt87x.c
@@ -291,7 +291,11 @@ static void snd_bt87x_pci_error(struct snd_bt87x *chip, unsigned int status)
}
}
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19)
static irqreturn_t snd_bt87x_interrupt(int irq, void *dev_id, struct pt_regs *regs)
+#else
+static irqreturn_t snd_bt87x_interrupt(int irq, void *dev_id)
+#endif
{
struct snd_bt87x *chip = dev_id;
unsigned int status, irq_status;