git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to kernel-2.6.20-1.2949.fc6.vs2.2.0.1
[linux-2.6.git]
/
include
/
asm-m68knommu
/
irqnode.h
diff --git
a/include/asm-m68knommu/irqnode.h
b/include/asm-m68knommu/irqnode.h
index
a2503df
..
6132a98
100644
(file)
--- a/
include/asm-m68knommu/irqnode.h
+++ b/
include/asm-m68knommu/irqnode.h
@@
-8,7
+8,7
@@
* interrupt source (if it supports chaining).
*/
typedef struct irq_node {
* interrupt source (if it supports chaining).
*/
typedef struct irq_node {
- irq
return_t (*handler)(int, void *, struct pt_regs *)
;
+ irq
_handler_t handler
;
unsigned long flags;
void *dev_id;
const char *devname;
unsigned long flags;
void *dev_id;
const char *devname;
@@
-18,12
+18,12
@@
typedef struct irq_node {
/*
* This structure has only 4 elements for speed reasons
*/
/*
* This structure has only 4 elements for speed reasons
*/
-
typedef struct irq_handler
{
- irq
return_t (*handler)(int, void *, struct pt_regs *)
;
+
struct irq_entry
{
+ irq
_handler_t handler
;
unsigned long flags;
void *dev_id;
const char *devname;
unsigned long flags;
void *dev_id;
const char *devname;
-}
irq_handler_t
;
+};
/* count of spurious interrupts */
extern volatile unsigned int num_spurious;
/* count of spurious interrupts */
extern volatile unsigned int num_spurious;