diff options
| author | Jeff Garzik <jeff@garzik.org> | 2007-02-17 15:11:43 -0500 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2007-02-17 15:11:43 -0500 |
| commit | f630fe2817601314b2eb7ca5ddc23c7834646731 (patch) | |
| tree | 3bfb4939b7bbc3859575ca8b58fa3f929b015941 /arch/arm/kernel/irq.c | |
| parent | 48c871c1f6a7c7044dd76774fb469e65c7e2e4e8 (diff) | |
| parent | 8a03d9a498eaf02c8a118752050a5154852c13bf (diff) | |
Merge branch 'master' into upstream
Diffstat (limited to 'arch/arm/kernel/irq.c')
| -rw-r--r-- | arch/arm/kernel/irq.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/kernel/irq.c b/arch/arm/kernel/irq.c index ec01f08f5642..e101846ab7dd 100644 --- a/arch/arm/kernel/irq.c +++ b/arch/arm/kernel/irq.c | |||
| @@ -159,8 +159,7 @@ void __init init_IRQ(void) | |||
| 159 | int irq; | 159 | int irq; |
| 160 | 160 | ||
| 161 | for (irq = 0; irq < NR_IRQS; irq++) | 161 | for (irq = 0; irq < NR_IRQS; irq++) |
| 162 | irq_desc[irq].status |= IRQ_NOREQUEST | IRQ_DELAYED_DISABLE | | 162 | irq_desc[irq].status |= IRQ_NOREQUEST | IRQ_NOPROBE; |
| 163 | IRQ_NOPROBE; | ||
| 164 | 163 | ||
| 165 | #ifdef CONFIG_SMP | 164 | #ifdef CONFIG_SMP |
| 166 | bad_irq_desc.affinity = CPU_MASK_ALL; | 165 | bad_irq_desc.affinity = CPU_MASK_ALL; |