Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 275376
b: refs/heads/master
c: 0dde595
h: refs/heads/master
v: v3
  • Loading branch information
Geert Uytterhoeven committed Nov 8, 2011
1 parent 0b3fa24 commit 251a067
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: c288bf2533e57174b90b07860c4391bcd1ea269c
refs/heads/master: 0dde595be678c06e7de27c98f45403088f1b126a
8 changes: 4 additions & 4 deletions trunk/arch/m68k/include/asm/irq.h
Original file line number Diff line number Diff line change
Expand Up @@ -75,13 +75,13 @@ struct pt_regs;
* This structure is used to chain together the ISRs for a particular
* interrupt source (if it supports chaining).
*/
typedef struct irq_node {
struct irq_node {
irqreturn_t (*handler)(int, void *);
void *dev_id;
struct irq_node *next;
unsigned long flags;
const char *devname;
} irq_node_t;
};

/*
* This structure has only 4 elements for speed reasons
Expand All @@ -105,9 +105,9 @@ extern unsigned int m68k_irq_startup(unsigned int);
extern void m68k_irq_shutdown(unsigned int);

/*
* This function returns a new irq_node_t
* This function returns a new struct irq_node
*/
extern irq_node_t *new_irq_node(void);
extern struct irq_node *new_irq_node(void);

extern void m68k_setup_auto_interrupt(void (*handler)(unsigned int, struct pt_regs *));
extern void m68k_setup_user_interrupt(unsigned int vec, unsigned int cnt,
Expand Down
6 changes: 3 additions & 3 deletions trunk/arch/m68k/kernel/ints.c
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ static struct irq_chip user_irq_chip = {
};

#define NUM_IRQ_NODES 100
static irq_node_t nodes[NUM_IRQ_NODES];
static struct irq_node nodes[NUM_IRQ_NODES];

/*
* void init_IRQ(void)
Expand Down Expand Up @@ -160,9 +160,9 @@ void m68k_setup_irq_chip(struct irq_chip *contr, unsigned int irq,
irq_chip[irq + i] = contr;
}

irq_node_t *new_irq_node(void)
struct irq_node *new_irq_node(void)
{
irq_node_t *node;
struct irq_node *node;
short i;

for (node = nodes, i = NUM_IRQ_NODES-1; i >= 0; node++, i--) {
Expand Down

0 comments on commit 251a067

Please sign in to comment.