Merge master.kernel.org:/pub/scm/linux/kernel/git/kyle/parisc-2.6

[sfrench/cifs-2.6.git] / arch / mips / lib / Makefile

diff --git a/arch/mips/lib/Makefile b/arch/mips/lib/Makefile
index 5ad501b30b430f387f219c575d4f7fbe9c8c517e..2453ea244cb8dd722c17afc5caa237ee7818db83 100644 (file)
--- a/arch/mips/lib/Makefile
+++ b/arch/mips/lib/Makefile
@@ -2,10 +2,11 @@
 # Makefile for MIPS-specific library files..
 #
 
-lib-y  += csum_partial.o memcpy.o memset.o promlib.o \
+lib-y  += csum_partial.o memcpy.o memcpy-inatomic.o memset.o promlib.o \
           strlen_user.o strncpy_user.o strnlen_user.o uncached.o
 
-obj-y  += iomap.o
+obj-y                  += iomap.o
+obj-$(CONFIG_PCI)      += iomap-pci.o
 
 # libgcc-style stuff needed in the kernel
 lib-y += ashldi3.o ashrdi3.o lshrdi3.o