Pull bugzilla-3774 into release branch

[linux-2.6-omap-h63xx.git] / arch / frv / kernel / irq.c

diff --git a/arch/frv/kernel/irq.c b/arch/frv/kernel/irq.c
index 5ac041c7c0a4749b72cf95e7daf6862b55761fee..c7e59dcadee47d58c7c44dac6d1cbce7a2134730 100644 (file)
--- a/arch/frv/kernel/irq.c
+++ b/arch/frv/kernel/irq.c
@@ -18,7 +18,6 @@
 #include <linux/timex.h>
 #include <linux/slab.h>
 #include <linux/random.h>
-#include <linux/smp_lock.h>
 #include <linux/init.h>
 #include <linux/kernel_stat.h>
 #include <linux/irq.h>
@@ -143,7 +142,7 @@ static struct irq_chip frv_cpu_pic = {
 asmlinkage void do_IRQ(void)
 {
        irq_enter();
-       generic_handle_irq(__get_IRL(), __frame);
+       generic_handle_irq(__get_IRL());
        irq_exit();
 }