Merge branch 'for-2.6.39' into for-2.6.40

[~andy/linux] / arch / tile / lib / memset_32.c

diff --git a/arch/tile/lib/memset_32.c b/arch/tile/lib/memset_32.c
index d014c1fbcbc28816af4925b72d121c1d201edf0a..57dbb3a5bff86a59e71054100c4ac1c885402a7b 100644 (file)
--- a/arch/tile/lib/memset_32.c
+++ b/arch/tile/lib/memset_32.c
@@ -18,6 +18,7 @@
 #include <linux/string.h>
 #include <linux/module.h>
 
+#undef memset
 
 void *memset(void *s, int c, size_t n)
 {