diff options
| -rw-r--r-- | arch/m68k/include/asm/irq.h | 8 | ||||
| -rw-r--r-- | arch/m68k/kernel/ints.c | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/arch/m68k/include/asm/irq.h b/arch/m68k/include/asm/irq.h index d8c6f68b7a78..bfc521f35bdf 100644 --- a/arch/m68k/include/asm/irq.h +++ b/arch/m68k/include/asm/irq.h | |||
| @@ -75,13 +75,13 @@ struct pt_regs; | |||
| 75 | * This structure is used to chain together the ISRs for a particular | 75 | * This structure is used to chain together the ISRs for a particular |
| 76 | * interrupt source (if it supports chaining). | 76 | * interrupt source (if it supports chaining). |
| 77 | */ | 77 | */ |
| 78 | typedef struct irq_node { | 78 | struct irq_node { |
| 79 | irqreturn_t (*handler)(int, void *); | 79 | irqreturn_t (*handler)(int, void *); |
| 80 | void *dev_id; | 80 | void *dev_id; |
| 81 | struct irq_node *next; | 81 | struct irq_node *next; |
| 82 | unsigned long flags; | 82 | unsigned long flags; |
| 83 | const char *devname; | 83 | const char *devname; |
| 84 | } irq_node_t; | 84 | }; |
| 85 | 85 | ||
| 86 | /* | 86 | /* |
| 87 | * This structure has only 4 elements for speed reasons | 87 | * This structure has only 4 elements for speed reasons |
| @@ -105,9 +105,9 @@ extern unsigned int m68k_irq_startup(unsigned int); | |||
| 105 | extern void m68k_irq_shutdown(unsigned int); | 105 | extern void m68k_irq_shutdown(unsigned int); |
| 106 | 106 | ||
| 107 | /* | 107 | /* |
| 108 | * This function returns a new irq_node_t | 108 | * This function returns a new struct irq_node |
| 109 | */ | 109 | */ |
| 110 | extern irq_node_t *new_irq_node(void); | 110 | extern struct irq_node *new_irq_node(void); |
| 111 | 111 | ||
| 112 | extern void m68k_setup_auto_interrupt(void (*handler)(unsigned int, struct pt_regs *)); | 112 | extern void m68k_setup_auto_interrupt(void (*handler)(unsigned int, struct pt_regs *)); |
| 113 | extern void m68k_setup_user_interrupt(unsigned int vec, unsigned int cnt, | 113 | extern void m68k_setup_user_interrupt(unsigned int vec, unsigned int cnt, |
diff --git a/arch/m68k/kernel/ints.c b/arch/m68k/kernel/ints.c index f43ad7b93ab6..9de8eb4eaefb 100644 --- a/arch/m68k/kernel/ints.c +++ b/arch/m68k/kernel/ints.c | |||
| @@ -70,7 +70,7 @@ static struct irq_chip user_irq_chip = { | |||
| 70 | }; | 70 | }; |
| 71 | 71 | ||
| 72 | #define NUM_IRQ_NODES 100 | 72 | #define NUM_IRQ_NODES 100 |
| 73 | static irq_node_t nodes[NUM_IRQ_NODES]; | 73 | static struct irq_node nodes[NUM_IRQ_NODES]; |
| 74 | 74 | ||
| 75 | /* | 75 | /* |
| 76 | * void init_IRQ(void) | 76 | * void init_IRQ(void) |
| @@ -160,9 +160,9 @@ void m68k_setup_irq_chip(struct irq_chip *contr, unsigned int irq, | |||
| 160 | irq_chip[irq + i] = contr; | 160 | irq_chip[irq + i] = contr; |
| 161 | } | 161 | } |
| 162 | 162 | ||
| 163 | irq_node_t *new_irq_node(void) | 163 | struct irq_node *new_irq_node(void) |
| 164 | { | 164 | { |
| 165 | irq_node_t *node; | 165 | struct irq_node *node; |
| 166 | short i; | 166 | short i; |
| 167 | 167 | ||
| 168 | for (node = nodes, i = NUM_IRQ_NODES-1; i >= 0; node++, i--) { | 168 | for (node = nodes, i = NUM_IRQ_NODES-1; i >= 0; node++, i--) { |
