tg3: use dma_alloc_coherent() instead of pci_alloc_consistent()

[net-next-2.6.git] / kernel / range.c

diff --git a/kernel/range.c b/kernel/range.c
index 74e2e6114927e7efa1c88bc098c74934f765f8de..37fa9b99ad588356534b1457b7241d97573705b8 100644 (file)
--- a/kernel/range.c
+++ b/kernel/range.c
@@ -7,10 +7,6 @@
 
 #include <linux/range.h>
 
-#ifndef ARRAY_SIZE
-#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
-#endif
-
 int add_range(struct range *range, int az, int nr_range, u64 start, u64 end)
 {
        if (start >= end)
@@ -123,7 +119,7 @@ static int cmp_range(const void *x1, const void *x2)
 
 int clean_sort_range(struct range *range, int az)
 {
-       int i, j, k = az - 1, nr_range = 0;
+       int i, j, k = az - 1, nr_range = az;
 
        for (i = 0; i < k; i++) {
                if (range[i].end)