git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
[pandora-kernel.git]
/
sound
/
oss
/
waveartist.c
diff --git
a/sound/oss/waveartist.c
b/sound/oss/waveartist.c
index
b48c729
..
c47842f
100644
(file)
--- a/
sound/oss/waveartist.c
+++ b/
sound/oss/waveartist.c
@@
-47,7
+47,7
@@
#include "waveartist.h"
#ifdef CONFIG_ARM
#include "waveartist.h"
#ifdef CONFIG_ARM
-#include <
asm
/hardware.h>
+#include <
mach
/hardware.h>
#include <asm/mach-types.h>
#endif
#include <asm/mach-types.h>
#endif
@@
-835,7
+835,7
@@
static struct audio_driver waveartist_audio_driver = {
static irqreturn_t
waveartist_intr(int irq, void *dev_id)
{
static irqreturn_t
waveartist_intr(int irq, void *dev_id)
{
- wavnc_info *devc =
(wavnc_info *)
dev_id;
+ wavnc_info *devc = dev_id;
int irqstatus, status;
spin_lock(&waveartist_lock);
int irqstatus, status;
spin_lock(&waveartist_lock);