diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-12-04 10:22:32 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-12-04 10:22:32 -0500 |
| commit | 79598324838a25cc378ecbb8c29dd1e3d3951d35 (patch) | |
| tree | 7d29e81580cba854042df4e33bdc8f38bbd65d03 /arch/sh/kernel/cpu/irq/imask.c | |
| parent | 8ee763b9c82c6ca0a59a7271ce4fa29d7baf5c09 (diff) | |
| parent | b00615d163cd24fa98d155acfc1f9d81d6fe1103 (diff) | |
Merge branch 'topic/core-change' into for-linus
Diffstat (limited to 'arch/sh/kernel/cpu/irq/imask.c')
| -rw-r--r-- | arch/sh/kernel/cpu/irq/imask.c | 2 |
1 files changed, 1 insertions, 1 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, |