diff --git a/[refs] b/[refs]
index 5c7304496255..12118bdf6477 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bcdd1ea350feb7ee28d4f425c312e9fdf681acfb
+refs/heads/master: d9e5b83b120dea9f306de06f7dead55103ab2d46
diff --git a/trunk/arch/powerpc/oprofile/Makefile b/trunk/arch/powerpc/oprofile/Makefile
new file mode 100644
index 000000000000..0782d0cca89c
--- /dev/null
+++ b/trunk/arch/powerpc/oprofile/Makefile
@@ -0,0 +1,11 @@
+obj-$(CONFIG_OPROFILE) += oprofile.o
+
+DRIVER_OBJS := $(addprefix ../../../drivers/oprofile/, \
+		oprof.o cpu_buffer.o buffer_sync.o \
+		event_buffer.o oprofile_files.o \
+		oprofilefs.o oprofile_stats.o \
+		timer_int.o )
+
+oprofile-y := $(DRIVER_OBJS) common.o
+oprofile-$(CONFIG_PPC64) += op_model_rs64.o op_model_power4.o
+oprofile-$(CONFIG_FSL_BOOKE) += op_model_fsl_booke.o
diff --git a/trunk/arch/ppc/oprofile/Makefile b/trunk/arch/ppc/oprofile/Makefile
index e2218d32a4eb..4bf75b776c5b 100644
--- a/trunk/arch/ppc/oprofile/Makefile
+++ b/trunk/arch/ppc/oprofile/Makefile
@@ -1,14 +1 @@
-obj-$(CONFIG_OPROFILE) += oprofile.o
-
-DRIVER_OBJS := $(addprefix ../../../drivers/oprofile/, \
-		oprof.o cpu_buffer.o buffer_sync.o \
-		event_buffer.o oprofile_files.o \
-		oprofilefs.o oprofile_stats.o \
-		timer_int.o )
-
-oprofile-y := $(DRIVER_OBJS) common.o
-
-ifeq ($(CONFIG_FSL_BOOKE),y)
-	oprofile-y += op_model_fsl_booke.o
-endif
-
+include arch/powerpc/oprofile/Makefile
diff --git a/trunk/arch/ppc64/oprofile/Makefile b/trunk/arch/ppc64/oprofile/Makefile
index 162dbf06c142..4bf75b776c5b 100644
--- a/trunk/arch/ppc64/oprofile/Makefile
+++ b/trunk/arch/ppc64/oprofile/Makefile
@@ -1,9 +1 @@
-obj-$(CONFIG_OPROFILE) += oprofile.o
-
-DRIVER_OBJS := $(addprefix ../../../drivers/oprofile/, \
-		oprof.o cpu_buffer.o buffer_sync.o \
-		event_buffer.o oprofile_files.o \
-		oprofilefs.o oprofile_stats.o \
-		timer_int.o )
-
-oprofile-y := $(DRIVER_OBJS) common.o op_model_rs64.o op_model_power4.o
+include arch/powerpc/oprofile/Makefile