lkml.org 
[lkml]   [2006]   [May]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
Subject[patch 38/50] genirq: ARM: Convert lh7a40x to generic irq handling
From: Thomas Gleixner <tglx@linutronix.de>

Fixup the conversion to generic irq subsystem.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
---
arch/arm/mach-lh7a40x/arch-lpd7a40x.c | 5 +++--
arch/arm/mach-lh7a40x/time.c | 1 +
2 files changed, 4 insertions(+), 2 deletions(-)

Index: linux-genirq.q/arch/arm/mach-lh7a40x/arch-lpd7a40x.c
===================================================================
--- linux-genirq.q.orig/arch/arm/mach-lh7a40x/arch-lpd7a40x.c
+++ linux-genirq.q/arch/arm/mach-lh7a40x/arch-lpd7a40x.c
@@ -12,6 +12,7 @@
#include <linux/init.h>
#include <linux/platform_device.h>
#include <linux/interrupt.h>
+#include <linux/irq.h>

#include <asm/hardware.h>
#include <asm/setup.h>
@@ -162,7 +163,7 @@ static void lpd7a40x_cpld_handler (unsig
{
unsigned int mask = CPLD_INTERRUPTS;

- desc->chip->ack (irq);
+ desc->handler->ack (irq);

if ((mask & 0x1) == 0) /* WLAN */
IRQ_DISPATCH (IRQ_LPD7A40X_ETH_INT);
@@ -170,7 +171,7 @@ static void lpd7a40x_cpld_handler (unsig
if ((mask & 0x2) == 0) /* Touch */
IRQ_DISPATCH (IRQ_LPD7A400_TS);

- desc->chip->unmask (irq); /* Level-triggered need this */
+ desc->handler->unmask (irq); /* Level-triggered need this */
}


Index: linux-genirq.q/arch/arm/mach-lh7a40x/time.c
===================================================================
--- linux-genirq.q.orig/arch/arm/mach-lh7a40x/time.c
+++ linux-genirq.q/arch/arm/mach-lh7a40x/time.c
@@ -12,6 +12,7 @@
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/interrupt.h>
+#include <linux/irq.h>
#include <linux/time.h>

#include <asm/hardware.h>
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
\
 
 \ /
  Last update: 2006-05-17 02:22    [W:0.027 / U:1.724 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site