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
/
waveartist.c
diff --git
a/sound/oss/waveartist.c
b/sound/oss/waveartist.c
index
22d2662
..
26a7c6a
100644
(file)
--- a/
sound/oss/waveartist.c
+++ b/
sound/oss/waveartist.c
@@
-1,5
+1,5
@@
/*
/*
- * linux/
drivers/sound
/waveartist.c
+ * linux/
sound/oss
/waveartist.c
*
* The low level driver for the RWA010 Rockwell Wave Artist
* codec chip used in the Rebel.com NetWinder.
*
* The low level driver for the RWA010 Rockwell Wave Artist
* codec chip used in the Rebel.com NetWinder.
@@
-833,7
+833,7
@@
static struct audio_driver waveartist_audio_driver = {
static irqreturn_t
static irqreturn_t
-waveartist_intr(int irq, void *dev_id
, struct pt_regs *regs
)
+waveartist_intr(int irq, void *dev_id)
{
wavnc_info *devc = (wavnc_info *)dev_id;
int irqstatus, status;
{
wavnc_info *devc = (wavnc_info *)dev_id;
int irqstatus, status;
@@
-1267,7
+1267,7
@@
static int __init waveartist_init(wavnc_info *devc)
conf_printf2(dev_name, devc->hw.io_base, devc->hw.irq,
devc->hw.dma, devc->hw.dma2);
conf_printf2(dev_name, devc->hw.io_base, devc->hw.irq,
devc->hw.dma, devc->hw.dma2);
- portc =
(wavnc_port_info *)
kmalloc(sizeof(wavnc_port_info), GFP_KERNEL);
+ portc = kmalloc(sizeof(wavnc_port_info), GFP_KERNEL);
if (portc == NULL)
goto nomem;
if (portc == NULL)
goto nomem;