commit 86a5cddbd9676b129cfa2ed7a1a11759d3b2b512
author Stephen Rothwell <sfr@canb.auug.org.au> Mon Sep 19 23:24:08 2005 +1000
committer Paul Mackerras <paulus@samba.org> Wed Sep 21 19:21:08 2005 +1000
tree 7d5d4fdda4df9067c43870f5dcb3d5c714fdf227
parent 654810ec899ea5f2fc2138fca1793b603d481ff4

[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>

arch/ppc64/Makefile

diff --git a/arch/ppc64/Makefile b/arch/ppc64/Makefile
index 17d2c1e..a887788 100644
--- a/arch/ppc64/Makefile
+++ b/arch/ppc64/Makefile
@@ -85,7 +85,7 @@
 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