summaryrefslogtreecommitdiffstats
path: root/arch/cris/arch-v10
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-03-01 19:06:09 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2010-03-01 19:06:09 +0100
commit8098a7ef8946169cf8ffeb6f4d8130fc3651192e (patch)
tree90d2da5a7340a1cbaf5f779986d733a900b88f15 /arch/cris/arch-v10
parentMerge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst... (diff)
parentcris: Fixup last users of irq_chip->typename (diff)
downloadlinux-8098a7ef8946169cf8ffeb6f4d8130fc3651192e.tar.xz
linux-8098a7ef8946169cf8ffeb6f4d8130fc3651192e.zip
Merge branch 'for-linus' of git://repo.or.cz/cris-mirror
* 'for-linus' of git://repo.or.cz/cris-mirror: cris: Fixup last users of irq_chip->typename CRIS v32: Should index be positive?
Diffstat (limited to 'arch/cris/arch-v10')
-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 5d75f77f9c73..1a61efc13982 100644
--- a/arch/cris/arch-v10/kernel/irq.c
+++ b/arch/cris/arch-v10/kernel/irq.c
@@ -133,7 +133,7 @@ static void end_crisv10_irq(unsigned int irq)
}
static struct irq_chip crisv10_irq_type = {
- .typename = "CRISv10",
+ .name = "CRISv10",
.startup = startup_crisv10_irq,
.shutdown = shutdown_crisv10_irq,
.enable = enable_crisv10_irq,