Manual merge of for-linus to upstream (fix conflicts in drivers/infiniband/core/ucm.c)

[linux-2.6] / lib / sort.c

diff --git a/lib/sort.c b/lib/sort.c
index b73dbb0e7c83a4721fafbe4401c551a02e3225f9..ddc4d35df289cff02a996ba41d0d560ce9ccdead 100644 (file)
--- a/lib/sort.c
+++ b/lib/sort.c
@@ -6,15 +6,16 @@
 
 #include <linux/kernel.h>
 #include <linux/module.h>
+#include <linux/sort.h>
 
-void u32_swap(void *a, void *b, int size)
+static void u32_swap(void *a, void *b, int size)
 {
        u32 t = *(u32 *)a;
        *(u32 *)a = *(u32 *)b;
        *(u32 *)b = t;
 }
 
-void generic_swap(void *a, void *b, int size)
+static void generic_swap(void *a, void *b, int size)
 {
        char t;