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

oprofile s390 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/s390/oprofile/init.c |    7 +------
 1 files changed, 1 insertion(+), 6 deletions(-)

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