[PATCH] PnP Updates for 2.6.4-mm2

[Adam Belay <ambx1@neo.rr.com>]

Hi Andrew,

This is the first of a series of PnP updates for 2.6.4.  I would appreciate if
these could be tested in your -mm tree.

Thanks,
Adam

[PNP] Resource Conflict Cleanup

This patch cleans up the resource conflict logic and was originally from Matthew
Wilcox <willy@debian.org>.

--- a/drivers/pnp/resource.c	2004-01-23 15:19:25.000000000 +0000
+++ b/drivers/pnp/resource.c	2004-02-01 20:07:41.000000000 +0000
@@ -231,15 +231,9 @@
 
 #define length(start, end) (*(end) - *(start) + 1)

-/* ranged_conflict - used to determine if two resource ranges conflict
- * condition 1: check if the start of a is within b
- * condition 2: check if the end of a is within b
- * condition 3: check if b is engulfed by a */
-
+/* Two ranges conflict if one doesn't end before the other starts */
 #define ranged_conflict(starta, enda, startb, endb) \
-((*(starta) >= *(startb) && *(starta) <= *(endb)) || \
- (*(enda) >= *(startb) && *(enda) <= *(endb)) || \
- (*(starta) < *(startb) && *(enda) > *(endb)))
+	!((*(enda) < *(startb)) || (*(endb) < *(starta)))

 #define cannot_compare(flags) \
 ((flags) & (IORESOURCE_UNSET | IORESOURCE_DISABLED))