Subject: linux-next: manual merge of the mips tree with Linus' tree

From: Stephen Rothwell <[email-masked]>
Date: Mon, 7 Nov 2011 11:04:16 +1100

Hi Ralf,

Today's linux-next merge of the mips tree got a conflict in
arch/mips/alchemy/common/dbdma.c between commit f2e442fd2ff4 ("MIPS:
Alchemy: clean DMA code of CONFIG_SOC_AU1??? defines") from Linus' tree
and commit 6e8722f887b2 ("MIPS: irq: Remove IRQF_DISABLED") from the mips
tree.

I fixed it up (see below) and can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    [email-masked]

diff --cc arch/mips/alchemy/common/dbdma.c
index 0e63ee4,4025d77..0000000
--- a/arch/mips/alchemy/common/dbdma.c
+++ b/arch/mips/alchemy/common/dbdma.c
@@@ -1019,8 -1037,19 +1019,7 @@@ static int __init dbdma_setup(unsigned 
  	dbdma_gptr->ddma_inten = 0xffff;
  	au_sync();
  
- 	ret = request_irq(irq, dbdma_interrupt, IRQF_DISABLED, "dbdma",
- 			  (void *)dbdma_gptr);
 -	switch (alchemy_get_cputype()) {
 -	case ALCHEMY_CPU_AU1550:
 -		irq_nr = AU1550_DDMA_INT;
 -		break;
 -	case ALCHEMY_CPU_AU1200:
 -		irq_nr = AU1200_DDMA_INT;
 -		break;
 -	default:
 -		return -ENODEV;
 -	}
 -
 -	ret = request_irq(irq_nr, dbdma_interrupt, 0,
 -			"Au1xxx dbdma", (void *)dbdma_gptr);
++	ret = request_irq(irq, dbdma_interrupt, 0, "dbdma", (void *)dbdma_gptr);
  	if (ret)
  		printk(KERN_ERR "Cannot grab DBDMA interrupt!\n");
  	else {