powerpc: Remove use of CONFIG_PPC_MERGE
commit9c4cb82515130c62224e23fdf7c13c8f6c59c614
authorKumar Gala <galak@kernel.crashing.org>
Fri, 1 Aug 2008 16:44:11 +0000 (2 02:44 +1000)
committerPaul Mackerras <paulus@samba.org>
Mon, 4 Aug 2008 03:18:17 +0000 (4 13:18 +1000)
treef916fd843972502d918a1a03bdb99c9c2bbaa91c
parentc7c8eede2739289df02a1ab297cc476c6f38dca7
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>
15 files changed:
arch/powerpc/Kconfig.debug
arch/powerpc/include/asm/dcr.h
arch/powerpc/include/asm/i8259.h
arch/powerpc/include/asm/ipic.h
arch/powerpc/include/asm/irq.h
arch/powerpc/kernel/Makefile
arch/powerpc/kernel/cpu_setup_44x.S
arch/powerpc/kernel/irq.c
arch/powerpc/kernel/process.c
arch/powerpc/kernel/vdso.c
arch/powerpc/lib/Makefile
arch/powerpc/platforms/52xx/Makefile
arch/powerpc/platforms/Makefile
arch/powerpc/platforms/powermac/Makefile
arch/powerpc/sysdev/Makefile