diff options
Diffstat (limited to 'sound/soc/s3c24xx/s3c2443-ac97.c')
-rw-r--r-- | sound/soc/s3c24xx/s3c2443-ac97.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/sound/soc/s3c24xx/s3c2443-ac97.c b/sound/soc/s3c24xx/s3c2443-ac97.c index 75acf7ef5528..1c1ddbf7f3c0 100644 --- a/sound/soc/s3c24xx/s3c2443-ac97.c +++ b/sound/soc/s3c24xx/s3c2443-ac97.c | |||
@@ -23,7 +23,6 @@ | |||
23 | #include <linux/delay.h> | 23 | #include <linux/delay.h> |
24 | #include <linux/clk.h> | 24 | #include <linux/clk.h> |
25 | 25 | ||
26 | #include <sound/driver.h> | ||
27 | #include <sound/core.h> | 26 | #include <sound/core.h> |
28 | #include <sound/pcm.h> | 27 | #include <sound/pcm.h> |
29 | #include <sound/ac97_codec.h> | 28 | #include <sound/ac97_codec.h> |
@@ -32,7 +31,7 @@ | |||
32 | 31 | ||
33 | #include <asm/hardware.h> | 32 | #include <asm/hardware.h> |
34 | #include <asm/io.h> | 33 | #include <asm/io.h> |
35 | #include <asm/arch/regs-ac97.h> | 34 | #include <asm/plat-s3c/regs-ac97.h> |
36 | #include <asm/arch/regs-gpio.h> | 35 | #include <asm/arch/regs-gpio.h> |
37 | #include <asm/arch/regs-clock.h> | 36 | #include <asm/arch/regs-clock.h> |
38 | #include <asm/arch/audio.h> | 37 | #include <asm/arch/audio.h> |
@@ -253,7 +252,7 @@ static int s3c2443_ac97_probe(struct platform_device *pdev) | |||
253 | ac_glbctrl |= S3C_AC97_GLBCTRL_TRANSFERDATAENABLE; | 252 | ac_glbctrl |= S3C_AC97_GLBCTRL_TRANSFERDATAENABLE; |
254 | writel(ac_glbctrl, s3c24xx_ac97.regs + S3C_AC97_GLBCTRL); | 253 | writel(ac_glbctrl, s3c24xx_ac97.regs + S3C_AC97_GLBCTRL); |
255 | 254 | ||
256 | ret = request_irq(IRQ_S3C2443_AC97, s3c2443_ac97_irq, | 255 | ret = request_irq(IRQ_S3C244x_AC97, s3c2443_ac97_irq, |
257 | IRQF_DISABLED, "AC97", NULL); | 256 | IRQF_DISABLED, "AC97", NULL); |
258 | if (ret < 0) { | 257 | if (ret < 0) { |
259 | printk(KERN_ERR "s3c24xx-ac97: interrupt request failed.\n"); | 258 | printk(KERN_ERR "s3c24xx-ac97: interrupt request failed.\n"); |
@@ -266,7 +265,7 @@ static int s3c2443_ac97_probe(struct platform_device *pdev) | |||
266 | 265 | ||
267 | static void s3c2443_ac97_remove(struct platform_device *pdev) | 266 | static void s3c2443_ac97_remove(struct platform_device *pdev) |
268 | { | 267 | { |
269 | free_irq(IRQ_S3C2443_AC97, NULL); | 268 | free_irq(IRQ_S3C244x_AC97, NULL); |
270 | clk_disable(s3c24xx_ac97.ac97_clk); | 269 | clk_disable(s3c24xx_ac97.ac97_clk); |
271 | clk_put(s3c24xx_ac97.ac97_clk); | 270 | clk_put(s3c24xx_ac97.ac97_clk); |
272 | iounmap(s3c24xx_ac97.regs); | 271 | iounmap(s3c24xx_ac97.regs); |