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?

diff --combined arch/cris/kernel/irq.c
index b5ce0724a88f6f307292f46601a564f022ddaf2c,48fbdbdb58a8e4f50d560715d4a8f44687404c87..6d7b9eda40367c87c4f9e76540e04eab3442f8c8
--- 1/arch/cris/kernel/irq.c
--- 2/arch/cris/kernel/irq.c
+++ b/arch/cris/kernel/irq.c
@@@ -52,7 -52,7 +52,7 @@@ int show_interrupts(struct seq_file *p
        }
  
        if (i < NR_IRQS) {
 -              spin_lock_irqsave(&irq_desc[i].lock, flags);
 +              raw_spin_lock_irqsave(&irq_desc[i].lock, flags);
                action = irq_desc[i].action;
                if (!action)
                        goto skip;
@@@ -63,7 -63,7 +63,7 @@@
                for_each_online_cpu(j)
                        seq_printf(p, "%10u ", kstat_irqs_cpu(i, j));
  #endif
-               seq_printf(p, " %14s", irq_desc[i].chip->typename);
+               seq_printf(p, " %14s", irq_desc[i].chip->name);
                seq_printf(p, "  %s", action->name);
  
                for (action=action->next; action; action = action->next)
@@@ -71,7 -71,7 +71,7 @@@
  
                seq_putc(p, '\n');
  skip:
 -              spin_unlock_irqrestore(&irq_desc[i].lock, flags);
 +              raw_spin_unlock_irqrestore(&irq_desc[i].lock, flags);
        }
        return 0;
  }