diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2010-02-17 12:27:37 -0500 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2010-02-17 12:28:05 -0500 |
commit | b7e56edba4b02f2079042c326a8cd72a44635817 (patch) | |
tree | b5042002e9747cd8fb1278d61f86d8b92a74c018 /arch/mips/sni/pcimt.c | |
parent | 13ca0fcaa33f6b1984c4111b6ec5df42689fea6f (diff) | |
parent | b0483e78e5c4c9871fc5541875b3bc006846d46b (diff) |
Merge branch 'linus' into x86/mm
x86/mm is on 32-rc4 and missing the spinlock namespace changes which
are needed for further commits into this topic.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/mips/sni/pcimt.c')
-rw-r--r-- | arch/mips/sni/pcimt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/sni/pcimt.c b/arch/mips/sni/pcimt.c index 74e6c67982fb..51e62bbaa23b 100644 --- a/arch/mips/sni/pcimt.c +++ b/arch/mips/sni/pcimt.c | |||
@@ -214,7 +214,7 @@ static void end_pcimt_irq(unsigned int irq) | |||
214 | } | 214 | } |
215 | 215 | ||
216 | static struct irq_chip pcimt_irq_type = { | 216 | static struct irq_chip pcimt_irq_type = { |
217 | .typename = "PCIMT", | 217 | .name = "PCIMT", |
218 | .ack = disable_pcimt_irq, | 218 | .ack = disable_pcimt_irq, |
219 | .mask = disable_pcimt_irq, | 219 | .mask = disable_pcimt_irq, |
220 | .mask_ack = disable_pcimt_irq, | 220 | .mask_ack = disable_pcimt_irq, |