aboutsummaryrefslogtreecommitdiffstats
path: root/arch/cris/arch-v10/kernel
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-04-05 14:36:31 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2009-04-05 14:36:31 -0400
commitea431793f198e26d1553f36ed8b5a830b531eee4 (patch)
treeb97d79adee8cef49c65b0be96aa38d17f4005e18 /arch/cris/arch-v10/kernel
parent32fb6c17566ec66de87324a834c7776f40e35e78 (diff)
parent276e79ee6b3ff670dc9c041178da4b61af456a27 (diff)
Merge branch 'for-linus' of git://repo.or.cz/cris-mirror
* 'for-linus' of git://repo.or.cz/cris-mirror: CRISv32: Remove extraneous space between -I and the path. cris: convert obsolete hw_interrupt_type to struct irq_chip BUG to BUG_ON changes cpumask: use mm_cpumask() wrapper: cris cpumask: Use accessors code.: cris cpumask: prepare for iterators to only go to nr_cpu_ids/nr_cpumask_bits.: cris
Diffstat (limited to 'arch/cris/arch-v10/kernel')
-rw-r--r--arch/cris/arch-v10/kernel/irq.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/cris/arch-v10/kernel/irq.c b/arch/cris/arch-v10/kernel/irq.c
index 65ed803dae6f..5d75f77f9c73 100644
--- a/arch/cris/arch-v10/kernel/irq.c
+++ b/arch/cris/arch-v10/kernel/irq.c
@@ -132,7 +132,7 @@ static void end_crisv10_irq(unsigned int irq)
132{ 132{
133} 133}
134 134
135static struct hw_interrupt_type crisv10_irq_type = { 135static struct irq_chip crisv10_irq_type = {
136 .typename = "CRISv10", 136 .typename = "CRISv10",
137 .startup = startup_crisv10_irq, 137 .startup = startup_crisv10_irq,
138 .shutdown = shutdown_crisv10_irq, 138 .shutdown = shutdown_crisv10_irq,