diff options
Diffstat (limited to 'arch/sh64/mach-cayman')
-rw-r--r-- | arch/sh64/mach-cayman/irq.c | 4 | ||||
-rw-r--r-- | arch/sh64/mach-cayman/setup.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/sh64/mach-cayman/irq.c b/arch/sh64/mach-cayman/irq.c index 228ce61c3515..aaad36d37d1f 100644 --- a/arch/sh64/mach-cayman/irq.c +++ b/arch/sh64/mach-cayman/irq.c | |||
@@ -29,13 +29,13 @@ unsigned long epld_virt; | |||
29 | /* Note the SMSC SuperIO chip and SMSC LAN chip interrupts are all muxed onto | 29 | /* Note the SMSC SuperIO chip and SMSC LAN chip interrupts are all muxed onto |
30 | the same SH-5 interrupt */ | 30 | the same SH-5 interrupt */ |
31 | 31 | ||
32 | static irqreturn_t cayman_interrupt_smsc(int irq, void *dev_id, struct pt_regs *regs) | 32 | static irqreturn_t cayman_interrupt_smsc(int irq, void *dev_id) |
33 | { | 33 | { |
34 | printk(KERN_INFO "CAYMAN: spurious SMSC interrupt\n"); | 34 | printk(KERN_INFO "CAYMAN: spurious SMSC interrupt\n"); |
35 | return IRQ_NONE; | 35 | return IRQ_NONE; |
36 | } | 36 | } |
37 | 37 | ||
38 | static irqreturn_t cayman_interrupt_pci2(int irq, void *dev_id, struct pt_regs *regs) | 38 | static irqreturn_t cayman_interrupt_pci2(int irq, void *dev_id) |
39 | { | 39 | { |
40 | printk(KERN_INFO "CAYMAN: spurious PCI interrupt, IRQ %d\n", irq); | 40 | printk(KERN_INFO "CAYMAN: spurious PCI interrupt, IRQ %d\n", irq); |
41 | return IRQ_NONE; | 41 | return IRQ_NONE; |
diff --git a/arch/sh64/mach-cayman/setup.c b/arch/sh64/mach-cayman/setup.c index 3ed87cd059d0..c3611cc2735f 100644 --- a/arch/sh64/mach-cayman/setup.c +++ b/arch/sh64/mach-cayman/setup.c | |||
@@ -213,7 +213,7 @@ static int __init smsc_superio_setup(void) | |||
213 | SMSC_SUPERIO_WRITE_INDEXED(0x00, 0xc7); /* GP47 = nIOWOP */ | 213 | SMSC_SUPERIO_WRITE_INDEXED(0x00, 0xc7); /* GP47 = nIOWOP */ |
214 | #endif | 214 | #endif |
215 | 215 | ||
216 | /* Exit the configuraton state */ | 216 | /* Exit the configuration state */ |
217 | outb(SMSC_EXIT_CONFIG_KEY, SMSC_CONFIG_PORT_ADDR); | 217 | outb(SMSC_EXIT_CONFIG_KEY, SMSC_CONFIG_PORT_ADDR); |
218 | 218 | ||
219 | return 0; | 219 | return 0; |