[PATCH] powerpc: merge the rest of arch/ppc*/oprofile

- merge common.c
- move model specific files
- remove stub Makefiles
- clean up arch/ppc*/Makefile

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>

1 files changed, 1 insertions, 1 deletions

diff --git a/arch/ppc64/Makefile b/arch/ppc64/Makefile
index 17d2c1eac3b8..a8877881bb48 100644
--- a/arch/ppc64/Makefile
+++ b/arch/ppc64/Makefile
@@ -85,7 +85,7 @@ libs-y				+= arch/ppc64/lib/
 core-y                          += arch/ppc64/kernel/
 core-y                          += arch/ppc64/mm/
 core-$(CONFIG_XMON)             += arch/ppc64/xmon/
-drivers-$(CONFIG_OPROFILE)      += arch/ppc64/oprofile/
+drivers-$(CONFIG_OPROFILE)      += arch/powerpc/oprofile/
 
 boot := arch/ppc64/boot