diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2012-01-11 09:41:47 -0500 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2012-01-11 09:41:47 -0500 |
| commit | 39b741431af7f6f46b2e0e7f7f13ea2351fb4a5f (patch) | |
| tree | 89355f4ae7bbb874537bb65f71ba0d19b3d468e1 /arch/mips/alchemy/common/dbdma.c | |
| parent | 5b0ec2efb7d373faa7b1a7632c459b93895d45cd (diff) | |
| parent | d7a887a73dec6c387b02a966a71aac767bbd9ce6 (diff) | |
Merge branch 'next/generic' into mips-for-linux-next
Diffstat (limited to 'arch/mips/alchemy/common/dbdma.c')
| -rw-r--r-- | arch/mips/alchemy/common/dbdma.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/mips/alchemy/common/dbdma.c b/arch/mips/alchemy/common/dbdma.c index 0e63ee487d6d..9ba407b4fc97 100644 --- a/arch/mips/alchemy/common/dbdma.c +++ b/arch/mips/alchemy/common/dbdma.c | |||
| @@ -1019,8 +1019,7 @@ static int __init dbdma_setup(unsigned int irq, dbdev_tab_t *idtable) | |||
| 1019 | dbdma_gptr->ddma_inten = 0xffff; | 1019 | dbdma_gptr->ddma_inten = 0xffff; |
| 1020 | au_sync(); | 1020 | au_sync(); |
| 1021 | 1021 | ||
| 1022 | ret = request_irq(irq, dbdma_interrupt, IRQF_DISABLED, "dbdma", | 1022 | ret = request_irq(irq, dbdma_interrupt, 0, "dbdma", (void *)dbdma_gptr); |
| 1023 | (void *)dbdma_gptr); | ||
| 1024 | if (ret) | 1023 | if (ret) |
| 1025 | printk(KERN_ERR "Cannot grab DBDMA interrupt!\n"); | 1024 | printk(KERN_ERR "Cannot grab DBDMA interrupt!\n"); |
| 1026 | else { | 1025 | else { |