diff options
Diffstat (limited to 'arch/mips/sni')
-rw-r--r-- | arch/mips/sni/irq.c | 2 | ||||
-rw-r--r-- | arch/mips/sni/sniprom.c | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/arch/mips/sni/irq.c b/arch/mips/sni/irq.c index 8511bcc6d99d..039e8e540508 100644 --- a/arch/mips/sni/irq.c +++ b/arch/mips/sni/irq.c | |||
@@ -37,7 +37,7 @@ static void end_pciasic_irq(unsigned int irq) | |||
37 | } | 37 | } |
38 | 38 | ||
39 | static struct irq_chip pciasic_irq_type = { | 39 | static struct irq_chip pciasic_irq_type = { |
40 | .typename = "ASIC-PCI", | 40 | .name = "ASIC-PCI", |
41 | .ack = disable_pciasic_irq, | 41 | .ack = disable_pciasic_irq, |
42 | .mask = disable_pciasic_irq, | 42 | .mask = disable_pciasic_irq, |
43 | .mask_ack = disable_pciasic_irq, | 43 | .mask_ack = disable_pciasic_irq, |
diff --git a/arch/mips/sni/sniprom.c b/arch/mips/sni/sniprom.c index d1d0f1f493b4..1213d166f22e 100644 --- a/arch/mips/sni/sniprom.c +++ b/arch/mips/sni/sniprom.c | |||
@@ -67,9 +67,8 @@ void prom_printf(char *fmt, ...) | |||
67 | va_end(args); | 67 | va_end(args); |
68 | } | 68 | } |
69 | 69 | ||
70 | unsigned long prom_free_prom_memory(void) | 70 | void __init prom_free_prom_memory(void) |
71 | { | 71 | { |
72 | return 0; | ||
73 | } | 72 | } |
74 | 73 | ||
75 | /* | 74 | /* |