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

Commit 418ca1f0 authored by Thomas Gleixner's avatar Thomas Gleixner Committed by Russell King
Browse files

[ARM] 3701/1: ARM: Convert plat-omap to generic irq handling 



Patch from Thomas Gleixner

From: Thomas Gleixner <tglx@linutronix.de>

Fixup the conversion to generic irq subsystem.

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent c75c625d

arch/arm/plat-omap/dma.c

+1 −1
Original line number Diff line number Diff line
@@ -24,9 +24,9 @@ 
#include <linux/spinlock.h>

#include <linux/errno.h>

#include <linux/interrupt.h>

#include <linux/irq.h>



#include <asm/system.h>

#include <asm/irq.h>

#include <asm/hardware.h>

#include <asm/dma.h>

#include <asm/io.h>

arch/arm/plat-omap/gpio.c

+1 −1
Original line number Diff line number Diff line
@@ -738,7 +738,7 @@ static void gpio_irq_handler(unsigned int irq, struct irqdesc *desc, 


	desc->chip->ack(irq);



	bank = (struct gpio_bank *) desc->data;

	bank = get_irq_data(irq);

	if (bank->method == METHOD_MPUIO)

		isr_reg = bank->base + OMAP_MPUIO_GPIO_INT;

#ifdef CONFIG_ARCH_OMAP15XX