diff options
| author | Kumar Gala <galak@kernel.crashing.org> | 2008-08-01 18:44:11 +0200 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-08-04 05:18:17 +0200 |
| commit | 9c4cb82515130c62224e23fdf7c13c8f6c59c614 (patch) | |
| tree | f916fd843972502d918a1a03bdb99c9c2bbaa91c /arch/powerpc/lib/Makefile | |
| parent | powerpc: Force printing of 'total_memory' to unsigned long long (diff) | |
| download | linux-9c4cb82515130c62224e23fdf7c13c8f6c59c614.tar.xz linux-9c4cb82515130c62224e23fdf7c13c8f6c59c614.zip | |
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/lib/Makefile')
| -rw-r--r-- | arch/powerpc/lib/Makefile | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/powerpc/lib/Makefile b/arch/powerpc/lib/Makefile index 2a88e8b9a3c6..d69912c07ce7 100644 --- a/arch/powerpc/lib/Makefile +++ b/arch/powerpc/lib/Makefile @@ -6,12 +6,10 @@ ifeq ($(CONFIG_PPC64),y) EXTRA_CFLAGS += -mno-minimal-toc endif -ifeq ($(CONFIG_PPC_MERGE),y) obj-y := string.o alloc.o \ checksum_$(CONFIG_WORD_SIZE).o obj-$(CONFIG_PPC32) += div64.o copy_32.o crtsavres.o obj-$(CONFIG_HAS_IOMEM) += devres.o -endif obj-$(CONFIG_PPC64) += copypage_64.o copyuser_64.o \ memcpy_64.o usercopy_64.o mem_64.o string.o |