diff --git a/[refs] b/[refs] index 4b85e2175f02..19282f091368 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3003668ce422a00952e20e230fe09e3c2662cf25 +refs/heads/master: a5b4d4be6ce7939d1604fae05786833fffae02f9 diff --git a/trunk/arch/blackfin/mach-common/ints-priority.c b/trunk/arch/blackfin/mach-common/ints-priority.c index 2729cba715b0..7e8fab3d3137 100644 --- a/trunk/arch/blackfin/mach-common/ints-priority.c +++ b/trunk/arch/blackfin/mach-common/ints-priority.c @@ -1362,7 +1362,7 @@ int __init init_arch_irq(void) handle_level_irq); #else for (irq = BFIN_IRQ(0); irq <= SYS_IRQS; irq++) { - if (irq < CORE_IRQS) { + if (irq < CORE_IRQS && irq != IRQ_CGU_EVT) { irq_set_chip(irq, &bfin_sec_irqchip); __irq_set_handler(irq, handle_sec_fault, 0, NULL); } else if (irq >= BFIN_IRQ(21) && irq <= BFIN_IRQ(26)) {