Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 39b74143 authored by Ralf Baechle's avatar Ralf Baechle
Browse files

Merge branch 'next/generic' into mips-for-linux-next

parents 5b0ec2ef d7a887a7

arch/mips/alchemy/common/dbdma.c

+1 −2
Original line number Diff line number Diff line
@@ -1019,8 +1019,7 @@ static int __init dbdma_setup(unsigned int irq, dbdev_tab_t *idtable) 
	dbdma_gptr->ddma_inten = 0xffff;

	au_sync();



	ret = request_irq(irq, dbdma_interrupt, IRQF_DISABLED, "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 {

arch/mips/alchemy/common/time.c

+1 −1
Original line number Diff line number Diff line
@@ -92,7 +92,7 @@ static struct clock_event_device au1x_rtcmatch2_clockdev = { 


static struct irqaction au1x_rtcmatch2_irqaction = {

	.handler	= au1x_rtcmatch2_irq,

	.flags		= IRQF_DISABLED | IRQF_TIMER,

	.flags		= IRQF_TIMER,

	.name		= "timer",

	.dev_id		= &au1x_rtcmatch2_clockdev,

};

arch/mips/alchemy/devboards/db1200/platform.c

+2 −2
Original line number Diff line number Diff line
@@ -276,12 +276,12 @@ static int db1200_mmc_cd_setup(void *mmc_host, int en) 


	if (en) {

		ret = request_irq(DB1200_SD0_INSERT_INT, db1200_mmc_cd,

				  IRQF_DISABLED, "sd_insert", mmc_host);

				  0, "sd_insert", mmc_host);

		if (ret)

			goto out;



		ret = request_irq(DB1200_SD0_EJECT_INT, db1200_mmc_cd,

				  IRQF_DISABLED, "sd_eject", mmc_host);

				  0, "sd_eject", mmc_host);

		if (ret) {

			free_irq(DB1200_SD0_INSERT_INT, mmc_host);

			goto out;

arch/mips/cavium-octeon/setup.c

+0 −8
Original line number Diff line number Diff line
@@ -642,14 +642,6 @@ void __init plat_mem_setup(void) 


	total = 0;



	/* First add the init memory we will be returning.  */

	memory = __pa_symbol(&__init_begin) & PAGE_MASK;

	mem_alloc_size = (__pa_symbol(&__init_end) & PAGE_MASK) - memory;

	if (mem_alloc_size > 0) {

		add_memory_region(memory, mem_alloc_size, BOOT_MEM_RAM);

		total += mem_alloc_size;

	}



	/*

	 * The Mips memory init uses the first memory location for

	 * some memory vectors. When SPARSEMEM is in use, it doesn't

arch/mips/dec/setup.c

+0 −1
Original line number Diff line number Diff line
@@ -110,7 +110,6 @@ static struct irqaction fpuirq = { 
};



static struct irqaction busirq = {

	.flags = IRQF_DISABLED,

	.name = "bus error",

	.flags = IRQF_NO_THREAD,

};