diff options
| author | David S. Miller <davem@davemloft.net> | 2010-09-09 02:49:04 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-09-09 02:49:04 -0400 |
| commit | e199e6136ce6b151e6638ae93dca60748424d900 (patch) | |
| tree | 0d66e0b5d227c36b005e4f5537f4bbcfc6ed4904 /kernel/range.c | |
| parent | 972c40b5bee429c84ba727f8ac0a08292bc5dc3d (diff) | |
| parent | d56557af19867edb8c0e96f8e26399698a08857f (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'kernel/range.c')
| -rw-r--r-- | kernel/range.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/kernel/range.c b/kernel/range.c index 74e2e6114927..471b66acabb5 100644 --- a/kernel/range.c +++ b/kernel/range.c | |||
| @@ -7,10 +7,6 @@ | |||
| 7 | 7 | ||
| 8 | #include <linux/range.h> | 8 | #include <linux/range.h> |
| 9 | 9 | ||
| 10 | #ifndef ARRAY_SIZE | ||
| 11 | #define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0])) | ||
| 12 | #endif | ||
| 13 | |||
| 14 | int add_range(struct range *range, int az, int nr_range, u64 start, u64 end) | 10 | int add_range(struct range *range, int az, int nr_range, u64 start, u64 end) |
| 15 | { | 11 | { |
| 16 | if (start >= end) | 12 | if (start >= end) |