diff options
| author | Paul Mackerras <paulus@samba.org> | 2005-10-28 13:50:39 +1000 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-10-28 13:50:39 +1000 |
| commit | 22b280324acbfd1a1f2374055d9bb39e7069e2bf (patch) | |
| tree | 135f45548120ffc198ba0b2105b83f7f805d123a /arch/powerpc/lib/Makefile | |
| parent | 4542437679de448de0f75bc901dab380d6a5bc5b (diff) | |
| parent | 299f6ce491aa28515d86f29af2779cbfdc7a4790 (diff) | |
Merge git://oak/home/sfr/kernels/iseries/work/
Diffstat (limited to 'arch/powerpc/lib/Makefile')
| -rw-r--r-- | arch/powerpc/lib/Makefile | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/arch/powerpc/lib/Makefile b/arch/powerpc/lib/Makefile index 30367a0237d..0115bf96751 100644 --- a/arch/powerpc/lib/Makefile +++ b/arch/powerpc/lib/Makefile @@ -2,12 +2,16 @@ # Makefile for ppc-specific library files.. # -obj-y := strcase.o string.o +ifeq ($(CONFIG_PPC_MERGE),y) +obj-y := string.o +endif + +obj-y += strcase.o obj-$(CONFIG_PPC32) += div64.o copy_32.o checksum_32.o -obj-$(CONFIG_PPC64) += copypage_64.o copyuser_64.o memcpy_64.o \ - usercopy_64.o sstep.o checksum_64.o mem_64.o +obj-$(CONFIG_PPC64) += checksum_64.o copypage_64.o copyuser_64.o \ + memcpy_64.o usercopy_64.o mem_64.o obj-$(CONFIG_PPC_ISERIES) += e2a.o ifeq ($(CONFIG_PPC64),y) obj-$(CONFIG_SMP) += locks.o +obj-$(CONFIG_DEBUG_KERNEL) += sstep.o endif - |