diff options
| author | Andreas Ruprecht <rupran@einserver.de> | 2014-12-17 06:05:13 -0500 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2014-12-28 23:45:55 -0500 |
| commit | 803d57de2b27000ed4400d16561c75821efe8333 (patch) | |
| tree | d354d4dd6a37fcd8d1301c24c626c69d5dba3247 /arch/powerpc/lib | |
| parent | 01b14505c35cdc47f5abc1f6799cee23f2f10149 (diff) | |
powerpc/lib: Do not include string.o in obj-y twice
In the Makefile, string.o (which is generated from string.S) is
included into the list of objects being built unconditionally
(obj-y) in line 12.
Additionally, if CONFIG_PPC64 is set, it is included again in
line 17.
This patch removes the latter unnecessary inclusion.
Signed-off-by: Andreas Ruprecht <rupran@einserver.de>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Diffstat (limited to 'arch/powerpc/lib')
| -rw-r--r-- | arch/powerpc/lib/Makefile | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/powerpc/lib/Makefile b/arch/powerpc/lib/Makefile index 597562f69b2d..1b01159b81f3 100644 --- a/arch/powerpc/lib/Makefile +++ b/arch/powerpc/lib/Makefile | |||
| @@ -14,8 +14,7 @@ obj-y := string.o alloc.o \ | |||
| 14 | obj-$(CONFIG_PPC32) += div64.o copy_32.o | 14 | obj-$(CONFIG_PPC32) += div64.o copy_32.o |
| 15 | 15 | ||
| 16 | obj-$(CONFIG_PPC64) += copypage_64.o copyuser_64.o \ | 16 | obj-$(CONFIG_PPC64) += copypage_64.o copyuser_64.o \ |
| 17 | usercopy_64.o mem_64.o string.o \ | 17 | usercopy_64.o mem_64.o hweight_64.o \ |
| 18 | hweight_64.o \ | ||
| 19 | copyuser_power7.o string_64.o copypage_power7.o | 18 | copyuser_power7.o string_64.o copypage_power7.o |
| 20 | ifeq ($(CONFIG_GENERIC_CSUM),) | 19 | ifeq ($(CONFIG_GENERIC_CSUM),) |
| 21 | obj-y += checksum_$(CONFIG_WORD_SIZE).o | 20 | obj-y += checksum_$(CONFIG_WORD_SIZE).o |