Merge with /home/shaggy/git/linus-clean/

[powerpc.git] / arch / s390 / lib / Makefile

diff --git a/arch/s390/lib/Makefile b/arch/s390/lib/Makefile
index f20b51f..e05d087 100644 (file)
--- a/arch/s390/lib/Makefile
+++ b/arch/s390/lib/Makefile
@@ -6,4 +6,4 @@ EXTRA_AFLAGS := -traditional
 
 lib-y += delay.o string.o
 lib-y += $(if $(CONFIG_64BIT),uaccess64.o,uaccess.o)
-lib-$(CONFIG_SMP) += spinlock.o
\ No newline at end of file
+lib-$(CONFIG_SMP) += spinlock.o