diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-09-14 08:19:08 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-09-14 08:19:08 -0400 |
| commit | 905ec87e93bc9e01b15c60035cd6a50c636cbaef (patch) | |
| tree | 46fd7618d6511611ffc19eb0dd4d7bc6b90a41c2 /arch/v850/kernel/setup.c | |
| parent | 1d6ae775d7a948c9575658eb41184fd2e506c0df (diff) | |
| parent | 2f4ba45a75d6383b4a1201169a808ffea416ffa0 (diff) | |
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'arch/v850/kernel/setup.c')
| -rw-r--r-- | arch/v850/kernel/setup.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/arch/v850/kernel/setup.c b/arch/v850/kernel/setup.c index abd48409dcca..62bdb8d29fc0 100644 --- a/arch/v850/kernel/setup.c +++ b/arch/v850/kernel/setup.c | |||
| @@ -138,13 +138,13 @@ static void nmi_end (unsigned irq) | |||
| 138 | } | 138 | } |
| 139 | 139 | ||
| 140 | static struct hw_interrupt_type nmi_irq_type = { | 140 | static struct hw_interrupt_type nmi_irq_type = { |
| 141 | "NMI", | 141 | .typename = "NMI", |
| 142 | irq_zero, /* startup */ | 142 | .startup = irq_zero, /* startup */ |
| 143 | irq_nop, /* shutdown */ | 143 | .shutdown = irq_nop, /* shutdown */ |
| 144 | irq_nop, /* enable */ | 144 | .enable = irq_nop, /* enable */ |
| 145 | irq_nop, /* disable */ | 145 | .disable = irq_nop, /* disable */ |
| 146 | irq_nop, /* ack */ | 146 | .ack = irq_nop, /* ack */ |
| 147 | nmi_end, /* end */ | 147 | .end = nmi_end, /* end */ |
| 148 | }; | 148 | }; |
| 149 | 149 | ||
| 150 | void __init init_IRQ (void) | 150 | void __init init_IRQ (void) |