aboutsummaryrefslogtreecommitdiffstats
path: root/arch/ia64/lib/Makefile
diff options
context:
space:
mode:
authorTony Luck <tony.luck@intel.com>2005-10-20 10:41:44 -0700
committerTony Luck <tony.luck@intel.com>2005-10-20 10:41:44 -0700
commit9cec58dc138d6fcad9f447a19c8ff69f6540e667 (patch)
tree4fe1cca94fdba8b705c87615bee06d3346f687ce /arch/ia64/lib/Makefile
parent17e5ad6c0ce5a970e2830d0de8bdd60a2f077d38 (diff)
parentac9b9c667c2e1194e22ebe0a441ae1c37aaa9b90 (diff)
downloadkernel_samsung_smdk4412-9cec58dc138d6fcad9f447a19c8ff69f6540e667.zip
kernel_samsung_smdk4412-9cec58dc138d6fcad9f447a19c8ff69f6540e667.tar.gz
kernel_samsung_smdk4412-9cec58dc138d6fcad9f447a19c8ff69f6540e667.tar.bz2
Update from upstream with manual merge of Yasunori Goto's
changes to swiotlb.c made in commit 281dd25cdc0d6903929b79183816d151ea626341 since this file has been moved from arch/ia64/lib/swiotlb.c to lib/swiotlb.c Signed-off-by: Tony Luck <tony.luck@intel.com>
Diffstat (limited to 'arch/ia64/lib/Makefile')
-rw-r--r--arch/ia64/lib/Makefile1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/ia64/lib/Makefile b/arch/ia64/lib/Makefile
index 4be1546..ac64664 100644
--- 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