Merge branch 'from-linus' into upstream

[linux-2.6-omap-h63xx.git] / sound / oss / sh_dac_audio.c

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