diff options
author | <jgarzik@pretzel.yyz.us> | 2005-05-27 22:07:40 -0400 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2005-05-27 22:07:40 -0400 |
commit | ff0e0ea2f5d36fa90fc2c57fd019102b0a0cfabf (patch) | |
tree | 963cdd52a4032cd4827896c4e813cfbf6dd7b3e6 /kernel/irq/handle.c | |
parent | 43f66a6ce8da299344cf1bc2ac2311889cc88555 (diff) | |
parent | 1f15d694522af9cd7492695f11dd2dc77b6cf098 (diff) |
Automatic merge of /spare/repo/netdev-2.6 branch we18
Diffstat (limited to 'kernel/irq/handle.c')
-rw-r--r-- | kernel/irq/handle.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/irq/handle.c b/kernel/irq/handle.c index 2fb0e46e11f3..06b5a6323998 100644 --- a/kernel/irq/handle.c +++ b/kernel/irq/handle.c | |||
@@ -30,6 +30,7 @@ | |||
30 | */ | 30 | */ |
31 | irq_desc_t irq_desc[NR_IRQS] __cacheline_aligned = { | 31 | irq_desc_t irq_desc[NR_IRQS] __cacheline_aligned = { |
32 | [0 ... NR_IRQS-1] = { | 32 | [0 ... NR_IRQS-1] = { |
33 | .status = IRQ_DISABLED, | ||
33 | .handler = &no_irq_type, | 34 | .handler = &no_irq_type, |
34 | .lock = SPIN_LOCK_UNLOCKED | 35 | .lock = SPIN_LOCK_UNLOCKED |
35 | } | 36 | } |