Commit 7eaf8cd5 authored by Greg Ungerer's avatar Greg Ungerer Committed by Linus Torvalds

[PATCH] irqreturn_t fixes for m68knommu irq.h

parent 613d1564
......@@ -2,6 +2,7 @@
#define _M68K_IRQ_H_
#include <linux/config.h>
#include <linux/interrupt.h>
#include <asm/ptrace.h>
#ifdef CONFIG_COLDFIRE
......@@ -62,7 +63,7 @@ extern void (*mach_enable_irq)(unsigned int);
extern void (*mach_disable_irq)(unsigned int);
extern int sys_request_irq(unsigned int,
void (*)(int, void *, struct pt_regs *),
irqreturn_t (*)(int, void *, struct pt_regs *),
unsigned long, const char *, void *);
extern void sys_free_irq(unsigned int, void *);
......@@ -91,7 +92,7 @@ extern void sys_free_irq(unsigned int, void *);
* interrupt source (if it supports chaining).
*/
typedef struct irq_node {
void (*handler)(int, void *, struct pt_regs *);
irqreturn_t (*handler)(int, void *, struct pt_regs *);
unsigned long flags;
void *dev_id;
const char *devname;
......@@ -102,7 +103,7 @@ typedef struct irq_node {
* This structure has only 4 elements for speed reasons
*/
typedef struct irq_handler {
void (*handler)(int, void *, struct pt_regs *);
irqreturn_t (*handler)(int, void *, struct pt_regs *);
unsigned long flags;
void *dev_id;
const char *devname;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment