Gitweb: http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=1ea9acc7823587266a26293a3b74deafc6637427 Commit: 1ea9acc7823587266a26293a3b74deafc6637427 Parent: b032fde9097605f9f1099eeca28f3b5b09e55ec0 Author: Greg Ungerer <[EMAIL PROTECTED]> AuthorDate: Wed Mar 7 11:28:13 2007 +1000 Committer: Linus Torvalds <[EMAIL PROTECTED]> CommitDate: Tue Mar 6 18:08:38 2007 -0800
[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 <[EMAIL PROTECTED]> Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]> --- arch/m68knommu/platform/68328/timers.c | 3 ++- arch/m68knommu/platform/68EZ328/config.c | 3 ++- arch/m68knommu/platform/68VZ328/config.c | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/arch/m68knommu/platform/68328/timers.c b/arch/m68knommu/platform/68328/timers.c index 438ef6e..ef067f4 100644 --- a/arch/m68knommu/platform/68328/timers.c +++ b/arch/m68knommu/platform/68328/timers.c @@ -17,6 +17,7 @@ #include <linux/types.h> #include <linux/kernel.h> #include <linux/mm.h> +#include <linux/interrupt.h> #include <asm/setup.h> #include <asm/system.h> #include <asm/pgtable.h> @@ -52,7 +53,7 @@ /***************************************************************************/ -void m68328_timer_init(irqreturn_t (*timer_routine) (int, void *, struct pt_regs *)) +void m68328_timer_init(irq_handler_t timer_routine) { /* disable timer 1 */ TCTL = 0; diff --git a/arch/m68knommu/platform/68EZ328/config.c b/arch/m68knommu/platform/68EZ328/config.c index 659b80a..ab36551 100644 --- a/arch/m68knommu/platform/68EZ328/config.c +++ b/arch/m68knommu/platform/68EZ328/config.c @@ -19,6 +19,7 @@ #include <linux/mm.h> #include <linux/tty.h> #include <linux/console.h> +#include <linux/interrupt.h> #include <asm/setup.h> #include <asm/system.h> @@ -31,7 +32,7 @@ /***************************************************************************/ -void m68328_timer_init(irqreturn_t (*timer_routine) (int, void *, struct pt_regs *)); +void m68328_timer_init(irq_handler_t timer_routine); void m68328_timer_tick(void); unsigned long m68328_timer_gettimeoffset(void); void 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 fcd100b..8abe0f6 100644 --- a/arch/m68knommu/platform/68VZ328/config.c +++ b/arch/m68knommu/platform/68VZ328/config.c @@ -21,6 +21,7 @@ #include <linux/console.h> #include <linux/kd.h> #include <linux/netdevice.h> +#include <linux/interrupt.h> #include <asm/setup.h> #include <asm/system.h> @@ -36,7 +37,7 @@ /***************************************************************************/ -void m68328_timer_init(irqreturn_t (*timer_routine) (int, void *, struct pt_regs *)); +void m68328_timer_init(irq_handler_t timer_routine); void m68328_timer_tick(void); unsigned long m68328_timer_gettimeoffset(void); void m68328_timer_gettod(int *year, int *mon, int *day, int *hour, int *min, int *sec); - To unsubscribe from this list: send the line "unsubscribe git-commits-head" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html