Merge tag 'trace-3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux...

[pandora-kernel.git] / drivers / nubus / nubus.c

diff --git a/drivers/nubus/nubus.c b/drivers/nubus/nubus.c
index 5066a7e..3319cf1 100644 (file)
--- a/drivers/nubus/nubus.c
+++ b/drivers/nubus/nubus.c
@@ -920,14 +920,10 @@ void __init nubus_probe_slot(int slot)
        rp = nubus_rom_addr(slot);      
        for(i = 4; i; i--)
        {
-               unsigned long flags;
                int card_present;
 
                rp--;
-               local_irq_save(flags);
                card_present = hwreg_present(rp);
-               local_irq_restore(flags);
-              
                if (!card_present)
                        continue;