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
linux 2.6.16.38 w/ vs2.0.3-rc1
[linux-2.6.git]
/
sound
/
oss
/
sh_dac_audio.c
diff --git
a/sound/oss/sh_dac_audio.c
b/sound/oss/sh_dac_audio.c
index
7b168d8
..
8a9917c
100644
(file)
--- a/
sound/oss/sh_dac_audio.c
+++ b/
sound/oss/sh_dac_audio.c
@@
-1,3
+1,4
@@
+#include <linux/config.h>
#include <linux/module.h>
#include <linux/init.h>
#include <linux/sched.h>
#include <linux/module.h>
#include <linux/init.h>
#include <linux/sched.h>
@@
-288,7
+289,7
@@
static int __init dac_audio_init(void)
in_use = 0;
in_use = 0;
- data_buffer = kmalloc(BUFFER_SIZE, GFP_KERNEL);
+ data_buffer =
(char *)
kmalloc(BUFFER_SIZE, GFP_KERNEL);
if (data_buffer == NULL)
return -ENOMEM;
if (data_buffer == NULL)
return -ENOMEM;
@@
-297,7
+298,7
@@
static int __init dac_audio_init(void)
dac_audio_set_rate();
retval =
dac_audio_set_rate();
retval =
- request_irq(TIMER1_IRQ, timer1_interrupt,
IRQF_DISABLED
, MODNAME, 0);
+ request_irq(TIMER1_IRQ, timer1_interrupt,
SA_INTERRUPT
, MODNAME, 0);
if (retval < 0) {
printk(KERN_ERR "sh_dac_audio: IRQ %d request failed\n",
TIMER1_IRQ);
if (retval < 0) {
printk(KERN_ERR "sh_dac_audio: IRQ %d request failed\n",
TIMER1_IRQ);