diff options
| author | Tony Luck <tony.luck@intel.com> | 2005-10-20 19:41:44 +0200 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-10-20 19:41:44 +0200 |
| commit | 9cec58dc138d6fcad9f447a19c8ff69f6540e667 (patch) | |
| tree | 4fe1cca94fdba8b705c87615bee06d3346f687ce /arch/sparc64/lib/Makefile | |
| parent | [PATCH] Removed remaining PCI specific references from swiotlb.c (diff) | |
| parent | [PATCH] Fix handling spurious page fault for hugetlb region (diff) | |
| download | linux-9cec58dc138d6fcad9f447a19c8ff69f6540e667.tar.xz linux-9cec58dc138d6fcad9f447a19c8ff69f6540e667.zip | |
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/sparc64/lib/Makefile')
| -rw-r--r-- | arch/sparc64/lib/Makefile | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/sparc64/lib/Makefile b/arch/sparc64/lib/Makefile index d968aebe83b2..c295806500f7 100644 --- a/arch/sparc64/lib/Makefile +++ b/arch/sparc64/lib/Makefile @@ -14,6 +14,4 @@ lib-y := PeeCeeI.o copy_page.o clear_page.o strlen.o strncmp.o \ copy_in_user.o user_fixup.o memmove.o \ mcount.o ipcsum.o rwsem.o xor.o find_bit.o delay.o -lib-$(CONFIG_HAVE_DEC_LOCK) += dec_and_lock.o - obj-y += iomap.o |