diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2009-11-17 20:53:52 -0500 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-11-17 20:53:52 -0500 |
| commit | 260af56271f79da0e37faa5a99b1786b221297e5 (patch) | |
| tree | d76a2609f940b88083314d5f9131c73115bd4dcb /arch/sh | |
| parent | 1dca899e95d27475c9036ce1cf857a72852b9c53 (diff) | |
| parent | 648f15345add88a7eea724365fe1217a8d8a1e16 (diff) | |
Merge branch 'sh/stable-updates'
Diffstat (limited to 'arch/sh')
| -rw-r--r-- | arch/sh/kernel/cpu/irq/imask.c | 2 | ||||
| -rw-r--r-- | arch/sh/kernel/cpu/irq/intc-sh5.c | 2 |
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 6b5d191eec3a..a351ed84eec5 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) | |||
| 68 | } | 68 | } |
| 69 | 69 | ||
| 70 | static struct irq_chip imask_irq_chip = { | 70 | static struct irq_chip imask_irq_chip = { |
| 71 | .typename = "SR.IMASK", | 71 | .name = "SR.IMASK", |
| 72 | .mask = mask_imask_irq, | 72 | .mask = mask_imask_irq, |
| 73 | .unmask = unmask_imask_irq, | 73 | .unmask = unmask_imask_irq, |
| 74 | .mask_ack = mask_imask_irq, | 74 | .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 6c092f1f5557..06e7e2959b54 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); | |||
| 85 | static void end_intc_irq(unsigned int irq); | 85 | static void end_intc_irq(unsigned int irq); |
| 86 | 86 | ||
| 87 | static struct irq_chip intc_irq_type = { | 87 | static struct irq_chip intc_irq_type = { |
| 88 | .typename = "INTC", | 88 | .name = "INTC", |
| 89 | .startup = startup_intc_irq, | 89 | .startup = startup_intc_irq, |
| 90 | .shutdown = shutdown_intc_irq, | 90 | .shutdown = shutdown_intc_irq, |
| 91 | .enable = enable_intc_irq, | 91 | .enable = enable_intc_irq, |