aboutsummaryrefslogtreecommitdiff
path: root/arch/powerpc/platforms/Makefile
diff options
context:
space:
mode:
authorKumar Gala <galak@kernel.crashing.org>2008-08-02 02:44:11 +1000
committerPaul Mackerras <paulus@samba.org>2008-08-04 13:18:17 +1000
commit9c4cb82515130c62224e23fdf7c13c8f6c59c614 (patch)
treef916fd843972502d918a1a03bdb99c9c2bbaa91c /arch/powerpc/platforms/Makefile
parentc7c8eede2739289df02a1ab297cc476c6f38dca7 (diff)
downloadlinux-linaro-stable-9c4cb82515130c62224e23fdf7c13c8f6c59c614.tar.gz
powerpc: Remove use of CONFIG_PPC_MERGE
Now that arch/ppc is gone and CONFIG_PPC_MERGE is always set, remove the dead code associated with !CONFIG_PPC_MERGE from arch/powerpc and include/asm-powerpc. Signed-off-by: Kumar Gala <galak@kernel.crashing.org> Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/powerpc/platforms/Makefile')
-rw-r--r--arch/powerpc/platforms/Makefile6
1 files changed, 0 insertions, 6 deletions
diff --git a/arch/powerpc/platforms/Makefile b/arch/powerpc/platforms/Makefile
index 423a0234dc31..8079e0b4fd69 100644
--- a/arch/powerpc/platforms/Makefile
+++ b/arch/powerpc/platforms/Makefile
@@ -1,13 +1,7 @@
obj-$(CONFIG_FSL_ULI1575) += fsl_uli1575.o
-ifeq ($(CONFIG_PPC_MERGE),y)
obj-$(CONFIG_PPC_PMAC) += powermac/
-else
-ifeq ($(CONFIG_PPC64),y)
-obj-$(CONFIG_PPC_PMAC) += powermac/
-endif
-endif
obj-$(CONFIG_PPC_CHRP) += chrp/
obj-$(CONFIG_40x) += 40x/
obj-$(CONFIG_44x) += 44x/