---

yaml --- r: 91633 b: refs/heads/master c: 5dc0742 h: refs/heads/master i: 91631: 05735be v: v3
git-mirror · Apr 20, 2008 · 05dd3f6 · 05dd3f6
1 parent 8fcb856
commit 05dd3f6
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 90968eb5a415a0fe6ffb617af35b3a5321bd4497
+refs/heads/master: 5dc0742b41066e1e141f2b4b00557e563a83fccc
diff --git a/trunk/arch/sparc/kernel/time.c b/trunk/arch/sparc/kernel/time.c
@@ -105,7 +105,7 @@ __volatile__ unsigned int *master_l10_limit;
 
 #define TICK_SIZE (tick_nsec / 1000)
 
-irqreturn_t timer_interrupt(int irq, void *dev_id)
+static irqreturn_t timer_interrupt(int dummy, void *dev_id)
 {
 	/* last time the cmos clock got updated */
 	static long last_rtc_update;

diff --git a/trunk/include/asm-sparc/floppy.h b/trunk/include/asm-sparc/floppy.h
@@ -280,7 +280,7 @@ static inline void sun_fd_enable_dma(void)
 
 /* Our low-level entry point in arch/sparc/kernel/entry.S */
 extern int sparc_floppy_request_irq(int irq, unsigned long flags,
-				    irqreturn_t (*irq_handler)(int irq, void *));
+				    irq_handler_t irq_handler);
 
 static int sun_fd_request_irq(void)
 {