diff options
author | Kumar Gala <galak@kernel.crashing.org> | 2008-08-01 12:44:11 -0400 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2008-08-03 23:18:17 -0400 |
commit | 9c4cb82515130c62224e23fdf7c13c8f6c59c614 (patch) | |
tree | f916fd843972502d918a1a03bdb99c9c2bbaa91c /arch/powerpc/platforms/Makefile | |
parent | c7c8eede2739289df02a1ab297cc476c6f38dca7 (diff) |
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/Makefile | 6 |
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 @@ | |||
1 | 1 | ||
2 | obj-$(CONFIG_FSL_ULI1575) += fsl_uli1575.o | 2 | obj-$(CONFIG_FSL_ULI1575) += fsl_uli1575.o |
3 | 3 | ||
4 | ifeq ($(CONFIG_PPC_MERGE),y) | ||
5 | obj-$(CONFIG_PPC_PMAC) += powermac/ | 4 | obj-$(CONFIG_PPC_PMAC) += powermac/ |
6 | else | ||
7 | ifeq ($(CONFIG_PPC64),y) | ||
8 | obj-$(CONFIG_PPC_PMAC) += powermac/ | ||
9 | endif | ||
10 | endif | ||
11 | obj-$(CONFIG_PPC_CHRP) += chrp/ | 5 | obj-$(CONFIG_PPC_CHRP) += chrp/ |
12 | obj-$(CONFIG_40x) += 40x/ | 6 | obj-$(CONFIG_40x) += 40x/ |
13 | obj-$(CONFIG_44x) += 44x/ | 7 | obj-$(CONFIG_44x) += 44x/ |