git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
sound
/
oss
/
dmasound
/
dmasound_paula.c
diff --git
a/sound/oss/dmasound/dmasound_paula.c
b/sound/oss/dmasound/dmasound_paula.c
index
494070a
..
90fc058
100644
(file)
--- a/
sound/oss/dmasound/dmasound_paula.c
+++ b/
sound/oss/dmasound/dmasound_paula.c
@@
-16,7
+16,6
@@
#include <linux/module.h>
#include <linux/module.h>
-#include <linux/config.h>
#include <linux/mm.h>
#include <linux/init.h>
#include <linux/ioport.h>
#include <linux/mm.h>
#include <linux/init.h>
#include <linux/ioport.h>
@@
-83,7
+82,7
@@
static int AmiSetVolume(int volume);
static int AmiSetTreble(int treble);
static void AmiPlayNextFrame(int index);
static void AmiPlay(void);
static int AmiSetTreble(int treble);
static void AmiPlayNextFrame(int index);
static void AmiPlay(void);
-static irqreturn_t AmiInterrupt(int irq, void *dummy
, struct pt_regs *fp
);
+static irqreturn_t AmiInterrupt(int irq, void *dummy);
#ifdef CONFIG_HEARTBEAT
#ifdef CONFIG_HEARTBEAT
@@
-557,7
+556,7
@@
static void AmiPlay(void)
}
}
-static irqreturn_t AmiInterrupt(int irq, void *dummy
, struct pt_regs *fp
)
+static irqreturn_t AmiInterrupt(int irq, void *dummy)
{
int minframes = 1;
{
int minframes = 1;