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

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

diff -puN arch/parisc/oprofile/init.c~oprofile-update-parisc-for-api-changes arch/parisc/oprofile/init.c
--- 25/arch/parisc/oprofile/init.c~oprofile-update-parisc-for-api-changes	Tue Nov  9 13:55:33 2004
+++ 25-akpm/arch/parisc/oprofile/init.c	Tue Nov  9 13:55:33 2004
@@ -12,11 +12,8 @@
 #include <linux/kernel.h>
 #include <linux/oprofile.h>
 
-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)
 {
-	return -ENODEV;
 }
 
 
_
