Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/perex/alsa

[linux-2.6-omap-h63xx.git] / sound / soc / s3c24xx / s3c2443-ac97.c

diff --git a/sound/soc/s3c24xx/s3c2443-ac97.c b/sound/soc/s3c24xx/s3c2443-ac97.c
index 758a2637e7ac408d7eb46ba4bf16f051e9ea9e00..1c1ddbf7f3c01e61605fc5f1ee29856f3a215349 100644 (file)
--- a/sound/soc/s3c24xx/s3c2443-ac97.c
+++ b/sound/soc/s3c24xx/s3c2443-ac97.c
@@ -23,7 +23,6 @@
 #include <linux/delay.h>
 #include <linux/clk.h>
 
-#include <sound/driver.h>
 #include <sound/core.h>
 #include <sound/pcm.h>
 #include <sound/ac97_codec.h>
@@ -253,7 +252,7 @@ static int s3c2443_ac97_probe(struct platform_device *pdev)
        ac_glbctrl |= S3C_AC97_GLBCTRL_TRANSFERDATAENABLE;
        writel(ac_glbctrl, s3c24xx_ac97.regs + S3C_AC97_GLBCTRL);
 
-       ret = request_irq(IRQ_S3C2443_AC97, s3c2443_ac97_irq,
+       ret = request_irq(IRQ_S3C244x_AC97, s3c2443_ac97_irq,
                IRQF_DISABLED, "AC97", NULL);
        if (ret < 0) {
                printk(KERN_ERR "s3c24xx-ac97: interrupt request failed.\n");
@@ -266,7 +265,7 @@ static int s3c2443_ac97_probe(struct platform_device *pdev)
 
 static void s3c2443_ac97_remove(struct platform_device *pdev)
 {
-       free_irq(IRQ_S3C2443_AC97, NULL);
+       free_irq(IRQ_S3C244x_AC97, NULL);
        clk_disable(s3c24xx_ac97.ac97_clk);
        clk_put(s3c24xx_ac97.ac97_clk);
        iounmap(s3c24xx_ac97.regs);