diff options
| author | Takashi Iwai <tiwai@suse.de> | 2011-10-26 17:51:48 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2011-10-26 17:51:48 -0400 |
| commit | 9430148d800dd929ad73da4c6afb67f793f8af43 (patch) | |
| tree | 437d0aec41428cbb310a202100ba581c63fbe89e /sound/arm/pxa2xx-ac97-lib.c | |
| parent | d22665702226e9c40bc331098559e3d55e7cd43d (diff) | |
| parent | 88e24c3a4b30a6bd361f2b5ce602667a8161b2e8 (diff) | |
Merge branch 'topic/remove-irqf_disable' into for-linus
Diffstat (limited to 'sound/arm/pxa2xx-ac97-lib.c')
| -rw-r--r-- | sound/arm/pxa2xx-ac97-lib.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/arm/pxa2xx-ac97-lib.c b/sound/arm/pxa2xx-ac97-lib.c index 88eec3847df2..8ad65352bf91 100644 --- a/sound/arm/pxa2xx-ac97-lib.c +++ b/sound/arm/pxa2xx-ac97-lib.c | |||
| @@ -359,7 +359,7 @@ int __devinit pxa2xx_ac97_hw_probe(struct platform_device *dev) | |||
| 359 | if (ret) | 359 | if (ret) |
| 360 | goto err_clk2; | 360 | goto err_clk2; |
| 361 | 361 | ||
| 362 | ret = request_irq(IRQ_AC97, pxa2xx_ac97_irq, IRQF_DISABLED, "AC97", NULL); | 362 | ret = request_irq(IRQ_AC97, pxa2xx_ac97_irq, 0, "AC97", NULL); |
| 363 | if (ret < 0) | 363 | if (ret < 0) |
| 364 | goto err_irq; | 364 | goto err_irq; |
| 365 | 365 | ||