diff options
| author | Jan Kara <jack@suse.cz> | 2008-06-24 05:43:00 -0400 |
|---|---|---|
| committer | Jan Kara <jack@suse.cz> | 2008-06-24 05:43:00 -0400 |
| commit | 19fd426a18b48a0446ba4b54ac66264916dcb7f3 (patch) | |
| tree | b9e0f2bc35e746c14f5e5e5519ed79f1eb4b0f98 /arch/powerpc/lib/Makefile | |
| parent | e8183c2452041326c95258ecc7865b6fcd91c730 (diff) | |
| parent | 62786b9e81a2dbe9c073a2ade52d33a2627d6d85 (diff) | |
Merge branch 'master' into for_mm
Diffstat (limited to 'arch/powerpc/lib/Makefile')
| -rw-r--r-- | arch/powerpc/lib/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/lib/Makefile b/arch/powerpc/lib/Makefile index c71d37dc6a88..e522b06cc42f 100644 --- a/arch/powerpc/lib/Makefile +++ b/arch/powerpc/lib/Makefile | |||
| @@ -9,7 +9,7 @@ endif | |||
| 9 | ifeq ($(CONFIG_PPC_MERGE),y) | 9 | ifeq ($(CONFIG_PPC_MERGE),y) |
| 10 | obj-y := string.o alloc.o \ | 10 | obj-y := string.o alloc.o \ |
| 11 | checksum_$(CONFIG_WORD_SIZE).o | 11 | checksum_$(CONFIG_WORD_SIZE).o |
| 12 | obj-$(CONFIG_PPC32) += div64.o copy_32.o | 12 | obj-$(CONFIG_PPC32) += div64.o copy_32.o crtsavres.o |
| 13 | obj-$(CONFIG_HAS_IOMEM) += devres.o | 13 | obj-$(CONFIG_HAS_IOMEM) += devres.o |
| 14 | endif | 14 | endif |
| 15 | 15 | ||