summaryrefslogtreecommitdiffstats
path: root/arch/ppc64/kernel/Makefile
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2005-10-28 12:51:45 +1000
committerStephen Rothwell <sfr@canb.auug.org.au>2005-10-28 12:51:45 +1000
commit640768eef245f1578e75e02c17d277a1496a535b (patch)
treedc36f97b830076fcdc09c1fe2ec8bf5675fc772a /arch/ppc64/kernel/Makefile
parent9675c7ebcf1f6308d66b0fcb42ae585e200e80a9 (diff)
downloadblackbird-obmc-linux-640768eef245f1578e75e02c17d277a1496a535b.tar.gz
blackbird-obmc-linux-640768eef245f1578e75e02c17d277a1496a535b.zip
ppc64: use the merged syscall table
This allows us to also use entry_64.S from the merged tree and reverts the setup_64.c part of fda262b8978d0089758ef9444508434c74113a61. Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Diffstat (limited to 'arch/ppc64/kernel/Makefile')
-rw-r--r--arch/ppc64/kernel/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ppc64/kernel/Makefile b/arch/ppc64/kernel/Makefile
index 863bd7d746fb..a20a305b825d 100644
--- a/arch/ppc64/kernel/Makefile
+++ b/arch/ppc64/kernel/Makefile
@@ -7,7 +7,7 @@ ifneq ($(CONFIG_PPC_MERGE),y)
EXTRA_CFLAGS += -mno-minimal-toc
extra-y := head.o vmlinux.lds
-obj-y := entry.o misc.o prom.o
+obj-y := misc.o prom.o
endif
OpenPOWER on IntegriCloud