summaryrefslogtreecommitdiffstats
path: root/arch/sh
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2009-11-18 10:53:52 +0900
committerPaul Mundt <lethal@linux-sh.org>2009-11-18 10:53:52 +0900
commit260af56271f79da0e37faa5a99b1786b221297e5 (patch)
treed76a2609f940b88083314d5f9131c73115bd4dcb /arch/sh
parent1dca899e95d27475c9036ce1cf857a72852b9c53 (diff)
parent648f15345add88a7eea724365fe1217a8d8a1e16 (diff)
downloadop-kernel-dev-260af56271f79da0e37faa5a99b1786b221297e5.zip
op-kernel-dev-260af56271f79da0e37faa5a99b1786b221297e5.tar.gz
Merge branch 'sh/stable-updates'
Diffstat (limited to 'arch/sh')
-rw-r--r--arch/sh/kernel/cpu/irq/imask.c2
-rw-r--r--arch/sh/kernel/cpu/irq/intc-sh5.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/sh/kernel/cpu/irq/imask.c b/arch/sh/kernel/cpu/irq/imask.c
index 6b5d191..a351ed8 100644
--- a/arch/sh/kernel/cpu/irq/imask.c
+++ b/arch/sh/kernel/cpu/irq/imask.c
@@ -68,7 +68,7 @@ static void unmask_imask_irq(unsigned int irq)
}
static struct irq_chip imask_irq_chip = {
- .typename = "SR.IMASK",
+ .name = "SR.IMASK",
.mask = mask_imask_irq,
.unmask = unmask_imask_irq,
.mask_ack = mask_imask_irq,
diff --git a/arch/sh/kernel/cpu/irq/intc-sh5.c b/arch/sh/kernel/cpu/irq/intc-sh5.c
index 6c092f1..06e7e29 100644
--- a/arch/sh/kernel/cpu/irq/intc-sh5.c
+++ b/arch/sh/kernel/cpu/irq/intc-sh5.c
@@ -85,7 +85,7 @@ static void mask_and_ack_intc(unsigned int);
static void end_intc_irq(unsigned int irq);
static struct irq_chip intc_irq_type = {
- .typename = "INTC",
+ .name = "INTC",
.startup = startup_intc_irq,
.shutdown = shutdown_intc_irq,
.enable = enable_intc_irq,
OpenPOWER on IntegriCloud