aboutsummaryrefslogtreecommitdiff
path: root/arch/powerpc/platforms/powermac/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/powermac/Makefile
parentc7c8eede2739289df02a1ab297cc476c6f38dca7 (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/powermac/Makefile')
-rw-r--r--arch/powerpc/platforms/powermac/Makefile3
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/powerpc/platforms/powermac/Makefile b/arch/powerpc/platforms/powermac/Makefile
index 89774177b20..58ecdd72630 100644
--- a/arch/powerpc/platforms/powermac/Makefile
+++ b/arch/powerpc/platforms/powermac/Makefile
@@ -7,7 +7,7 @@ endif
obj-y += pic.o setup.o time.o feature.o pci.o \
sleep.o low_i2c.o cache.o pfunc_core.o \
- pfunc_base.o
+ pfunc_base.o udbg_scc.o udbg_adb.o
obj-$(CONFIG_PMAC_BACKLIGHT) += backlight.o
obj-$(CONFIG_CPU_FREQ_PMAC) += cpufreq_32.o
obj-$(CONFIG_CPU_FREQ_PMAC64) += cpufreq_64.o
@@ -19,4 +19,3 @@ obj-$(CONFIG_NVRAM:m=y) += nvram.o
obj-$(CONFIG_PPC64) += nvram.o
obj-$(CONFIG_PPC32) += bootx_init.o
obj-$(CONFIG_SMP) += smp.o
-obj-$(CONFIG_PPC_MERGE) += udbg_scc.o udbg_adb.o