Merge remote-tracking branch 'u-boot/master' into u-boot-arm-merged

[platform/kernel/u-boot.git] / lib / qsort.c

diff --git a/lib/qsort.c b/lib/qsort.c
index 1cc0d31..5709884 100644 (file)
--- a/lib/qsort.c
+++ b/lib/qsort.c
@@ -16,12 +16,8 @@
  * bcc and gcc. */
 
 #include <linux/types.h>
+#include <common.h>
 #include <exports.h>
-#if 0
-#include <assert.h>
-#else
-#define assert(arg)
-#endif
 
 void qsort(void  *base,
           size_t nel,