diff --git a/[refs] b/[refs]
index a9276ec1f18d..9dd1f9bdd292 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1a410d883023da70806a0190c4bde104545cb9c6
+refs/heads/master: dca859329cee9b4cf02c8b7cb805b49973292ed2
diff --git a/trunk/arch/ppc64/oprofile/common.c b/trunk/arch/ppc64/oprofile/common.c
index 0260122a8d6c..3e8daabf1021 100644
--- a/trunk/arch/ppc64/oprofile/common.c
+++ b/trunk/arch/ppc64/oprofile/common.c
@@ -17,11 +17,8 @@
 #include <asm/system.h>
 #include <asm/pmc.h>
 #include <asm/cputable.h>
+#include <asm/oprofile_impl.h>
 
-#include "op_impl.h"
-
-extern struct op_ppc64_model op_model_rs64;
-extern struct op_ppc64_model op_model_power4;
 static struct op_ppc64_model *model;
 
 static struct op_counter_config ctr[OP_MAX_COUNTER];
diff --git a/trunk/arch/ppc64/oprofile/op_model_power4.c b/trunk/arch/ppc64/oprofile/op_model_power4.c
index e469610efde5..32b2bb5625fe 100644
--- a/trunk/arch/ppc64/oprofile/op_model_power4.c
+++ b/trunk/arch/ppc64/oprofile/op_model_power4.c
@@ -16,11 +16,10 @@
 #include <asm/cputable.h>
 #include <asm/systemcfg.h>
 #include <asm/rtas.h>
+#include <asm/oprofile_impl.h>
 
 #define dbg(args...)
 
-#include "op_impl.h"
-
 static unsigned long reset_value[OP_MAX_COUNTER];
 
 static int oprofile_running;
diff --git a/trunk/arch/ppc64/oprofile/op_model_rs64.c b/trunk/arch/ppc64/oprofile/op_model_rs64.c
index bcec506c266a..08c5b333f5c4 100644
--- a/trunk/arch/ppc64/oprofile/op_model_rs64.c
+++ b/trunk/arch/ppc64/oprofile/op_model_rs64.c
@@ -14,11 +14,10 @@
 #include <asm/system.h>
 #include <asm/processor.h>
 #include <asm/cputable.h>
+#include <asm/oprofile_impl.h>
 
 #define dbg(args...)
 
-#include "op_impl.h"
-
 static void ctrl_write(unsigned int i, unsigned int val)
 {
 	unsigned int tmp = 0;
diff --git a/trunk/arch/ppc64/oprofile/op_impl.h b/trunk/include/asm-ppc64/oprofile_impl.h
similarity index 95%
rename from trunk/arch/ppc64/oprofile/op_impl.h
rename to trunk/include/asm-ppc64/oprofile_impl.h
index 7fa7eaabc035..b04f1dfb1421 100644
--- a/trunk/arch/ppc64/oprofile/op_impl.h
+++ b/trunk/include/asm-ppc64/oprofile_impl.h
@@ -49,6 +49,9 @@ struct op_ppc64_model {
 	int num_counters;
 };
 
+extern struct op_ppc64_model op_model_rs64;
+extern struct op_ppc64_model op_model_power4;
+
 static inline unsigned int ctr_read(unsigned int i)
 {
 	switch(i) {