
From: Greg Banks <gnb@melbourne.sgi.com>

oprofile sh arch updates, including some internal API changes.

Signed-off-by: John Levon <levon@movementarian.org>
Signed-off-by: Greg Banks <gnb@melbourne.sgi.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 25-akpm/arch/sh/oprofile/op_model_null.c |    3 +--
 1 files changed, 1 insertion(+), 2 deletions(-)

diff -puN arch/sh/oprofile/op_model_null.c~oprofile-update-sh-for-api-changes arch/sh/oprofile/op_model_null.c
--- 25/arch/sh/oprofile/op_model_null.c~oprofile-update-sh-for-api-changes	Tue Nov  9 13:55:40 2004
+++ 25-akpm/arch/sh/oprofile/op_model_null.c	Tue Nov  9 13:55:40 2004
@@ -12,9 +12,8 @@
 #include <linux/init.h>
 #include <linux/errno.h>
 
-int __init oprofile_arch_init(struct oprofile_operations **ops)
+void __init oprofile_arch_init(struct oprofile_operations *ops)
 {
-	return -ENODEV;
 }
 
 void oprofile_arch_exit(void)
_
