Merge tag 'mmc-fixes-for-3.4-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git...

[~andy/linux] / arch / arm / kernel / irq.c

diff --git a/arch/arm/kernel/irq.c b/arch/arm/kernel/irq.c
index 3efd82cc95f06a8196b6a20e8c9fa65121d66009..71ccdbfed66276f2c76db1b683da17cab392f0ad 100644 (file)
--- a/arch/arm/kernel/irq.c
+++ b/arch/arm/kernel/irq.c
@@ -36,7 +36,6 @@
 #include <linux/proc_fs.h>
 
 #include <asm/exception.h>
-#include <asm/system.h>
 #include <asm/mach/arch.h>
 #include <asm/mach/irq.h>
 #include <asm/mach/time.h>
@@ -181,10 +180,7 @@ void migrate_irqs(void)
        local_irq_save(flags);
 
        for_each_irq_desc(i, desc) {
-               bool affinity_broken = false;
-
-               if (!desc)
-                       continue;
+               bool affinity_broken;
 
                raw_spin_lock(&desc->lock);
                affinity_broken = migrate_one_irq(desc);