diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-21 15:56:19 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-21 15:56:19 -0700 |
| commit | 98a1e95f9b5919b55c71a01546415074282d30d5 (patch) | |
| tree | 7e539231ae9cf64614b6b9b358804ff8fdf056be /arch/blackfin | |
| parent | abe834c8a5d7e55ee12c0c8c7a5308b2c5cba95d (diff) | |
| parent | 896c6fa1e59dd17e1ac2877c25cab19bbb24e666 (diff) | |
Merge branch 'irq-cleanups-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/misc-2.6
* 'irq-cleanups-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/misc-2.6:
[ISDN] minor irq handler cleanups
drivers/char: minor irq handler cleanups
[PPC] minor irq handler cleanups
[BLACKFIN] minor irq handler cleanups
[SPARC] minor irq handler cleanups
ARM minor irq handler cleanup: avoid passing unused info to irq
Diffstat (limited to 'arch/blackfin')
| -rw-r--r-- | arch/blackfin/kernel/time.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/blackfin/kernel/time.c b/arch/blackfin/kernel/time.c index 9bdc8f99183..715b3945e4c 100644 --- a/arch/blackfin/kernel/time.c +++ b/arch/blackfin/kernel/time.c @@ -39,8 +39,7 @@ /* This is an NTP setting */ #define TICK_SIZE (tick_nsec / 1000) -static void time_sched_init(irqreturn_t(*timer_routine) - (int, void *)); +static void time_sched_init(irq_handler_t timer_routine); static unsigned long gettimeoffset(void); static struct irqaction bfin_timer_irq = { @@ -64,7 +63,7 @@ static struct irqaction bfin_timer_irq = { #define TIME_SCALE 1 static void -time_sched_init(irqreturn_t(*timer_routine) (int, void *)) +time_sched_init(irq_handler_t timer_routine) { u32 tcount; |