diff --git a/[refs] b/[refs]
index dd377d9cf3ac..e201afd6bca3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 71a516adb6f3f178b0a961c55e7da75f8947afa5
+refs/heads/master: 75734e660665b9bb5da8fc06beb491b716f9af77
diff --git a/trunk/arch/blackfin/mach-bf561/include/mach/smp.h b/trunk/arch/blackfin/mach-bf561/include/mach/smp.h
index 2c8c514dd386..70cafb9c334d 100644
--- a/trunk/arch/blackfin/mach-bf561/include/mach/smp.h
+++ b/trunk/arch/blackfin/mach-bf561/include/mach/smp.h
@@ -7,6 +7,8 @@
 #ifndef _MACH_BF561_SMP
 #define _MACH_BF561_SMP
 
+/* This header has to stand alone to avoid circular deps */
+
 struct task_struct;
 
 void platform_init_cpus(void);
@@ -17,7 +19,7 @@ int platform_boot_secondary(unsigned int cpu, struct task_struct *idle);
 
 void platform_secondary_init(unsigned int cpu);
 
-void platform_request_ipi(int (*handler)(int, void *));
+void platform_request_ipi(/*irq_handler_t*/ void *handler);
 
 void platform_send_ipi(cpumask_t callmap);
 
diff --git a/trunk/arch/blackfin/mach-bf561/smp.c b/trunk/arch/blackfin/mach-bf561/smp.c
index be6083a7e42f..1a19fad63f4e 100644
--- a/trunk/arch/blackfin/mach-bf561/smp.c
+++ b/trunk/arch/blackfin/mach-bf561/smp.c
@@ -111,7 +111,7 @@ int __cpuinit platform_boot_secondary(unsigned int cpu, struct task_struct *idle
 		panic("CPU%u: processor failed to boot\n", cpu);
 }
 
-void __init platform_request_ipi(irq_handler_t handler)
+void __init platform_request_ipi(void *handler)
 {
 	int ret;
 
diff --git a/trunk/arch/blackfin/mach-common/smp.c b/trunk/arch/blackfin/mach-common/smp.c
index 06d6dda05084..930608dd358d 100644
--- a/trunk/arch/blackfin/mach-common/smp.c
+++ b/trunk/arch/blackfin/mach-common/smp.c
@@ -441,7 +441,7 @@ void __init smp_prepare_cpus(unsigned int max_cpus)
 {
 	platform_prepare_cpus(max_cpus);
 	ipi_queue_init();
-	platform_request_ipi(&ipi_handler);
+	platform_request_ipi(ipi_handler);
 }
 
 void __init smp_cpus_done(unsigned int max_cpus)