Merge branch 'merge'

2006-08-08 17:09:11 +10:00
parent 5cf13911b1 81b73dd92b
commit 32bc6e095d
298 changed files with 3243 additions and 2010 deletions
--- a/arch/powerpc/platforms/pseries/setup.c
+++ b/arch/powerpc/platforms/pseries/setup.c
@@ -213,8 +213,6 @@ static void pseries_lpar_enable_pmcs(void)
 {
 	unsigned long set, reset;

-	power4_enable_pmcs();
-
 	set = 1UL << 63;
 	reset = 0;
 	plpar_hcall_norets(H_PERFMON, set, reset);