Merge git://git.infradead.org/mtd-2.6

[linux-2.6-omap-h63xx.git] / arch / mips / oprofile / op_impl.h

diff --git a/arch/mips/oprofile/op_impl.h b/arch/mips/oprofile/op_impl.h
index fa6b4aae75233f764d1979f7b1f0e5fd9944545e..f04b54fb37d14a7050f96f058262728e88ae4aa4 100644 (file)
--- a/arch/mips/oprofile/op_impl.h
+++ b/arch/mips/oprofile/op_impl.h
@@ -10,7 +10,6 @@
 #ifndef OP_IMPL_H
 #define OP_IMPL_H 1
 
-extern int null_perf_irq(void);
 extern int (*perf_irq)(void);
 
 /* Per-counter configuration as set via oprofilefs.  */
@@ -28,7 +27,7 @@ struct op_counter_config {
 /* Per-architecture configury and hooks.  */
 struct op_mips_model {
        void (*reg_setup) (struct op_counter_config *);
-       void (*cpu_setup) (void * dummy);
+       void (*cpu_setup) (void *dummy);
        int (*init)(void);
        void (*exit)(void);
        void (*cpu_start)(void *args);