From ff0176b332fadbcabf4562e892b87ae855cfcdd5 Mon Sep 17 00:00:00 2001
From: Thomas Gleixner <tglx@linutronix.de>
Date: Tue, 17 Nov 2009 22:50:59 +0000
Subject: [PATCH] --- yaml --- r: 176905 b: refs/heads/master c:
 d0608b54740c82b08056b7611e38a3fd73be3564 h: refs/heads/master i:   176903:
 0d0d878b69108c3a457669cc98c64daadc2da47b v: v3

---
 [refs]                         | 2 +-
 trunk/arch/parisc/kernel/irq.c | 4 ++--
 trunk/drivers/parisc/dino.c    | 2 +-
 trunk/drivers/parisc/eisa.c    | 2 +-
 trunk/drivers/parisc/gsc.c     | 2 +-
 trunk/drivers/parisc/iosapic.c | 2 +-
 trunk/drivers/parisc/superio.c | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index 7a9ea60c13bf..d5fa0d51e445 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 217bfb5190813d97e6003f7692f8014655ffc02a
+refs/heads/master: d0608b54740c82b08056b7611e38a3fd73be3564
diff --git a/trunk/arch/parisc/kernel/irq.c b/trunk/arch/parisc/kernel/irq.c
index f47465e8d040..efbcee5d2220 100644
--- a/trunk/arch/parisc/kernel/irq.c
+++ b/trunk/arch/parisc/kernel/irq.c
@@ -145,7 +145,7 @@ static int cpu_set_affinity_irq(unsigned int irq, const struct cpumask *dest)
 #endif
 
 static struct irq_chip cpu_interrupt_type = {
-	.typename	= "CPU",
+	.name		= "CPU",
 	.startup	= cpu_startup_irq,
 	.shutdown	= cpu_disable_irq,
 	.enable		= cpu_enable_irq,
@@ -192,7 +192,7 @@ int show_interrupts(struct seq_file *p, void *v)
 		seq_printf(p, "%10u ", kstat_irqs(i));
 #endif
 
-		seq_printf(p, " %14s", irq_desc[i].chip->typename);
+		seq_printf(p, " %14s", irq_desc[i].chip->name);
 #ifndef PARISC_IRQ_CR16_COUNTS
 		seq_printf(p, "  %s", action->name);
 
diff --git a/trunk/drivers/parisc/dino.c b/trunk/drivers/parisc/dino.c
index d69bde6a2343..c542c7bb7454 100644
--- a/trunk/drivers/parisc/dino.c
+++ b/trunk/drivers/parisc/dino.c
@@ -354,7 +354,7 @@ static unsigned int dino_startup_irq(unsigned int irq)
 }
 
 static struct irq_chip dino_interrupt_type = {
-	.typename	= "GSC-PCI",
+	.name		= "GSC-PCI",
 	.startup	= dino_startup_irq,
 	.shutdown	= dino_disable_irq,
 	.enable		= dino_enable_irq, 
diff --git a/trunk/drivers/parisc/eisa.c b/trunk/drivers/parisc/eisa.c
index 51220749cb65..46f503fb7fc5 100644
--- a/trunk/drivers/parisc/eisa.c
+++ b/trunk/drivers/parisc/eisa.c
@@ -189,7 +189,7 @@ static unsigned int eisa_startup_irq(unsigned int irq)
 }
 
 static struct irq_chip eisa_interrupt_type = {
-	.typename =	"EISA",
+	.name	 =	"EISA",
 	.startup =	eisa_startup_irq,
 	.shutdown =	eisa_disable_irq,
 	.enable =	eisa_enable_irq,
diff --git a/trunk/drivers/parisc/gsc.c b/trunk/drivers/parisc/gsc.c
index 647adc9f85ad..c4e1f3c3c2fa 100644
--- a/trunk/drivers/parisc/gsc.c
+++ b/trunk/drivers/parisc/gsc.c
@@ -149,7 +149,7 @@ static unsigned int gsc_asic_startup_irq(unsigned int irq)
 }
 
 static struct irq_chip gsc_asic_interrupt_type = {
-	.typename =	"GSC-ASIC",
+	.name	 =	"GSC-ASIC",
 	.startup =	gsc_asic_startup_irq,
 	.shutdown =	gsc_asic_disable_irq,
 	.enable =	gsc_asic_enable_irq,
diff --git a/trunk/drivers/parisc/iosapic.c b/trunk/drivers/parisc/iosapic.c
index 88e333553212..c76836727cae 100644
--- a/trunk/drivers/parisc/iosapic.c
+++ b/trunk/drivers/parisc/iosapic.c
@@ -730,7 +730,7 @@ static int iosapic_set_affinity_irq(unsigned int irq,
 #endif
 
 static struct irq_chip iosapic_interrupt_type = {
-	.typename =	"IO-SAPIC-level",
+	.name	 =	"IO-SAPIC-level",
 	.startup =	iosapic_startup_irq,
 	.shutdown =	iosapic_disable_irq,
 	.enable =	iosapic_enable_irq,
diff --git a/trunk/drivers/parisc/superio.c b/trunk/drivers/parisc/superio.c
index 675f04e6597a..a35c9c5b89e8 100644
--- a/trunk/drivers/parisc/superio.c
+++ b/trunk/drivers/parisc/superio.c
@@ -326,7 +326,7 @@ static unsigned int superio_startup_irq(unsigned int irq)
 }
 
 static struct irq_chip superio_interrupt_type = {
-	.typename =	SUPERIO,
+	.name	 =	SUPERIO,
 	.startup =	superio_startup_irq,
 	.shutdown =	superio_disable_irq,
 	.enable =	superio_enable_irq,