From 68c7c4b9710ce9d1cf1b31df64ef6b15aeb7d475 Mon Sep 17 00:00:00 2001 From: Thomas Gleixner Date: Wed, 11 Mar 2009 01:46:11 +0100 Subject: [PATCH] --- yaml --- r: 141996 b: refs/heads/master c: c01ce82941af2e45c6f760d274bf33b485d60d1e h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/cris/arch-v10/kernel/irq.c | 2 +- trunk/arch/cris/arch-v32/kernel/irq.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 4199b2dd77c3..b0949b3c604b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 59b97760771143a2e4221df1c517f915cdb303f7 +refs/heads/master: c01ce82941af2e45c6f760d274bf33b485d60d1e diff --git a/trunk/arch/cris/arch-v10/kernel/irq.c b/trunk/arch/cris/arch-v10/kernel/irq.c index 65ed803dae6f..5d75f77f9c73 100644 --- a/trunk/arch/cris/arch-v10/kernel/irq.c +++ b/trunk/arch/cris/arch-v10/kernel/irq.c @@ -132,7 +132,7 @@ static void end_crisv10_irq(unsigned int irq) { } -static struct hw_interrupt_type crisv10_irq_type = { +static struct irq_chip crisv10_irq_type = { .typename = "CRISv10", .startup = startup_crisv10_irq, .shutdown = shutdown_crisv10_irq, diff --git a/trunk/arch/cris/arch-v32/kernel/irq.c b/trunk/arch/cris/arch-v32/kernel/irq.c index 295131fee710..df3925cb1c7f 100644 --- a/trunk/arch/cris/arch-v32/kernel/irq.c +++ b/trunk/arch/cris/arch-v32/kernel/irq.c @@ -333,7 +333,7 @@ void set_affinity_crisv32_irq(unsigned int irq, const struct cpumask *dest) spin_unlock_irqrestore(&irq_lock, flags); } -static struct hw_interrupt_type crisv32_irq_type = { +static struct irq_chip crisv32_irq_type = { .typename = "CRISv32", .startup = startup_crisv32_irq, .shutdown = shutdown_crisv32_irq,