aboutsummaryrefslogtreecommitdiffstats
path: root/arch/mips
diff options
context:
space:
mode:
Diffstat (limited to 'arch/mips')
-rw-r--r--arch/mips/au1000/common/dma.c2
-rw-r--r--arch/mips/au1000/common/irq.c2
-rw-r--r--arch/mips/au1000/common/time.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/arch/mips/au1000/common/dma.c b/arch/mips/au1000/common/dma.c
index c3019b9c91b1..c78260d4e837 100644
--- a/arch/mips/au1000/common/dma.c
+++ b/arch/mips/au1000/common/dma.c
@@ -160,7 +160,7 @@ void dump_au1000_dma_channel(unsigned int dmanr)
160 * Requests the DMA done IRQ if irqhandler != NULL. 160 * Requests the DMA done IRQ if irqhandler != NULL.
161 */ 161 */
162int request_au1000_dma(int dev_id, const char *dev_str, 162int request_au1000_dma(int dev_id, const char *dev_str,
163 irqreturn_t (*irqhandler)(int, void *), 163 irq_handler_t irqhandler,
164 unsigned long irqflags, 164 unsigned long irqflags,
165 void *irq_dev_id) 165 void *irq_dev_id)
166{ 166{
diff --git a/arch/mips/au1000/common/irq.c b/arch/mips/au1000/common/irq.c
index b32597e05a69..2abe132bb07d 100644
--- a/arch/mips/au1000/common/irq.c
+++ b/arch/mips/au1000/common/irq.c
@@ -288,7 +288,7 @@ static struct irq_chip level_irq_type = {
288}; 288};
289 289
290#ifdef CONFIG_PM 290#ifdef CONFIG_PM
291void startup_match20_interrupt(irqreturn_t (*handler)(int, void *)) 291void startup_match20_interrupt(irq_handler_t handler)
292{ 292{
293 struct irq_desc *desc = &irq_desc[AU1000_TOY_MATCH2_INT]; 293 struct irq_desc *desc = &irq_desc[AU1000_TOY_MATCH2_INT];
294 294
diff --git a/arch/mips/au1000/common/time.c b/arch/mips/au1000/common/time.c
index dd9c364b4746..94f09194d63d 100644
--- a/arch/mips/au1000/common/time.c
+++ b/arch/mips/au1000/common/time.c
@@ -61,7 +61,7 @@ static unsigned int timerhi = 0, timerlo = 0;
61#error "unsupported HZ value! Must be in [100,1000]" 61#error "unsupported HZ value! Must be in [100,1000]"
62#endif 62#endif
63#define MATCH20_INC (328*100/HZ) /* magic number 328 is for HZ=100... */ 63#define MATCH20_INC (328*100/HZ) /* magic number 328 is for HZ=100... */
64extern void startup_match20_interrupt(irqreturn_t (*handler)(int, void *)); 64extern void startup_match20_interrupt(irq_handler_t handler);
65static unsigned long last_pc0, last_match20; 65static unsigned long last_pc0, last_match20;
66#endif 66#endif
67 67