aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGreg Ungerer <gerg@snapgear.com>2007-03-06 20:28:13 -0500
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-03-06 21:08:38 -0500
commit1ea9acc7823587266a26293a3b74deafc6637427 (patch)
tree0b664aca895c8b1a9c566b54875d4419c0a794a3
parentb032fde9097605f9f1099eeca28f3b5b09e55ec0 (diff)
[PATCH] m68knommu: use irq_handler_t for passing handler types in 68328 setup
Use irq_handler_t type for passing around timer interrupt routine in 368360 setup code. Signed-off-by: Greg Ungerer <gerg@uclinux.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--arch/m68knommu/platform/68328/timers.c3
-rw-r--r--arch/m68knommu/platform/68EZ328/config.c3
-rw-r--r--arch/m68knommu/platform/68VZ328/config.c3
3 files changed, 6 insertions, 3 deletions
diff --git a/arch/m68knommu/platform/68328/timers.c b/arch/m68knommu/platform/68328/timers.c
index 438ef6ee9720..ef067f4c3cd4 100644
--- a/arch/m68knommu/platform/68328/timers.c
+++ b/arch/m68knommu/platform/68328/timers.c
@@ -17,6 +17,7 @@
17#include <linux/types.h> 17#include <linux/types.h>
18#include <linux/kernel.h> 18#include <linux/kernel.h>
19#include <linux/mm.h> 19#include <linux/mm.h>
20#include <linux/interrupt.h>
20#include <asm/setup.h> 21#include <asm/setup.h>
21#include <asm/system.h> 22#include <asm/system.h>
22#include <asm/pgtable.h> 23#include <asm/pgtable.h>
@@ -52,7 +53,7 @@
52 53
53/***************************************************************************/ 54/***************************************************************************/
54 55
55void m68328_timer_init(irqreturn_t (*timer_routine) (int, void *, struct pt_regs *)) 56void m68328_timer_init(irq_handler_t timer_routine)
56{ 57{
57 /* disable timer 1 */ 58 /* disable timer 1 */
58 TCTL = 0; 59 TCTL = 0;
diff --git a/arch/m68knommu/platform/68EZ328/config.c b/arch/m68knommu/platform/68EZ328/config.c
index 659b80aca118..ab36551fc969 100644
--- a/arch/m68knommu/platform/68EZ328/config.c
+++ b/arch/m68knommu/platform/68EZ328/config.c
@@ -19,6 +19,7 @@
19#include <linux/mm.h> 19#include <linux/mm.h>
20#include <linux/tty.h> 20#include <linux/tty.h>
21#include <linux/console.h> 21#include <linux/console.h>
22#include <linux/interrupt.h>
22 23
23#include <asm/setup.h> 24#include <asm/setup.h>
24#include <asm/system.h> 25#include <asm/system.h>
@@ -31,7 +32,7 @@
31 32
32/***************************************************************************/ 33/***************************************************************************/
33 34
34void m68328_timer_init(irqreturn_t (*timer_routine) (int, void *, struct pt_regs *)); 35void m68328_timer_init(irq_handler_t timer_routine);
35void m68328_timer_tick(void); 36void m68328_timer_tick(void);
36unsigned long m68328_timer_gettimeoffset(void); 37unsigned long m68328_timer_gettimeoffset(void);
37void m68328_timer_gettod(int *year, int *mon, int *day, int *hour, int *min, int *sec); 38void m68328_timer_gettod(int *year, int *mon, int *day, int *hour, int *min, int *sec);
diff --git a/arch/m68knommu/platform/68VZ328/config.c b/arch/m68knommu/platform/68VZ328/config.c
index fcd100b7594d..8abe0f6e7235 100644
--- a/arch/m68knommu/platform/68VZ328/config.c
+++ b/arch/m68knommu/platform/68VZ328/config.c
@@ -21,6 +21,7 @@
21#include <linux/console.h> 21#include <linux/console.h>
22#include <linux/kd.h> 22#include <linux/kd.h>
23#include <linux/netdevice.h> 23#include <linux/netdevice.h>
24#include <linux/interrupt.h>
24 25
25#include <asm/setup.h> 26#include <asm/setup.h>
26#include <asm/system.h> 27#include <asm/system.h>
@@ -36,7 +37,7 @@
36 37
37/***************************************************************************/ 38/***************************************************************************/
38 39
39void m68328_timer_init(irqreturn_t (*timer_routine) (int, void *, struct pt_regs *)); 40void m68328_timer_init(irq_handler_t timer_routine);
40void m68328_timer_tick(void); 41void m68328_timer_tick(void);
41unsigned long m68328_timer_gettimeoffset(void); 42unsigned long m68328_timer_gettimeoffset(void);
42void m68328_timer_gettod(int *year, int *mon, int *day, int *hour, int *min, int *sec); 43void m68328_timer_gettod(int *year, int *mon, int *day, int *hour, int *min, int *sec);