diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2005-10-13 07:52:04 +0200 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2005-10-13 07:52:04 +0200 |
commit | e8a30302abc42a0c537b9326883523da9963deb6 (patch) | |
tree | 3d4dc948afff95a2a86805d75162a8cdb3baded6 /arch/ppc/kernel/Makefile | |
parent | ppc64: use powerpc of_device.c (diff) | |
download | linux-e8a30302abc42a0c537b9326883523da9963deb6.tar.xz linux-e8a30302abc42a0c537b9326883523da9963deb6.zip |
powerpc: merge ptrace.c
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Diffstat (limited to 'arch/ppc/kernel/Makefile')
-rw-r--r-- | arch/ppc/kernel/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/ppc/kernel/Makefile b/arch/ppc/kernel/Makefile index 0cba463adf9a..7d16b1f7cd31 100644 --- a/arch/ppc/kernel/Makefile +++ b/arch/ppc/kernel/Makefile @@ -13,7 +13,7 @@ extra-$(CONFIG_POWER4) += idle_power4.o extra-y += vmlinux.lds obj-y := entry.o traps.o irq.o idle.o time.o misc.o \ - process.o signal.o ptrace.o align.o \ + process.o signal.o align.o \ syscalls.o setup.o \ ppc_htab.o perfmon.o obj-$(CONFIG_6xx) += l2cr.o cpu_setup_6xx.o @@ -38,7 +38,7 @@ endif else obj-y := irq.o idle.o time.o \ - signal.o ptrace.o align.o \ + signal.o align.o \ syscalls.o perfmon.o obj-$(CONFIG_6xx) += l2cr.o cpu_setup_6xx.o obj-$(CONFIG_SOFTWARE_SUSPEND) += swsusp.o |