Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...

[sfrench/cifs-2.6.git] / arch / mips / sni / rm200.c

diff --git a/arch/mips/sni/rm200.c b/arch/mips/sni/rm200.c
index 5e687819cbc2aec4aec85dbada30184a345a6551..46f00691f448865888991202e529ee9334bf9044 100644 (file)
--- a/arch/mips/sni/rm200.c
+++ b/arch/mips/sni/rm200.c
@@ -449,7 +449,7 @@ void end_rm200_irq(unsigned int irq)
 }
 
 static struct irq_chip rm200_irq_type = {
-       .typename = "RM200",
+       .name = "RM200",
        .ack = disable_rm200_irq,
        .mask = disable_rm200_irq,
        .mask_ack = disable_rm200_irq,