Update from upstream with manual merge of Yasunori Goto's

[linux-drm-fsl-dcu.git] / arch / ia64 / lib / Makefile

diff --git a/arch/ia64/lib/Makefile b/arch/ia64/lib/Makefile
index 4be1546e172650800922cf65160861cd9badd0be..ac64664a1807d3dfaa7e1122b8ae2e5203f45112 100644 (file)
--- a/arch/ia64/lib/Makefile
+++ b/arch/ia64/lib/Makefile
@@ -15,7 +15,6 @@ lib-$(CONFIG_ITANIUM) += copy_page.o copy_user.o memcpy.o
 lib-$(CONFIG_MCKINLEY) += copy_page_mck.o memcpy_mck.o
 lib-$(CONFIG_PERFMON)  += carta_random.o
 lib-$(CONFIG_MD_RAID5) += xor.o
-lib-$(CONFIG_HAVE_DEC_LOCK) += dec_and_lock.o
 
 AFLAGS___divdi3.o      =
 AFLAGS___udivdi3.o     = -DUNSIGNED