--- zzzz-none-000/linux-2.6.19.2/arch/powerpc/oprofile/op_model_power4.c	2007-01-10 19:10:37.000000000 +0000
+++ davinci-8020-5505/linux-2.6.19.2/arch/powerpc/oprofile/op_model_power4.c	2007-01-11 07:38:19.000000000 +0000
@@ -76,13 +76,13 @@
 {
 	if (__is_processor(PV_POWER4) || __is_processor(PV_POWER4p) ||
 	    __is_processor(PV_970) || __is_processor(PV_970FX) ||
-	    __is_processor(PV_970MP) || __is_processor(PV_970GX))
+	    __is_processor(PV_970MP))
 		return 1;
 
 	return 0;
 }
 
-static void power4_cpu_setup(struct op_counter_config *ctr)
+static void power4_cpu_setup(void *unused)
 {
 	unsigned int mmcr0 = mmcr0_val;
 	unsigned long mmcra = mmcra_val;