From: Bjorn Helgaas <bjorn.helgaas@hp.com>

We still need the IORESOURCE_DISABLED check for MEM resources there,
and I think it's missing from the version of
pnp-replace-pnp_resource_table-with-dynamically-allocated-resources.patch
that you just added to -mm.

Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 drivers/pnp/system.c |    2 ++
 1 file changed, 2 insertions(+)

diff -puN drivers/pnp/system.c~pnp-replace-pnp_resource_table-with-dynamically-allocated-resources-fix drivers/pnp/system.c
--- a/drivers/pnp/system.c~pnp-replace-pnp_resource_table-with-dynamically-allocated-resources-fix
+++ a/drivers/pnp/system.c
@@ -60,6 +60,8 @@ static void reserve_resources_of_dev(str
 	int i;
 
 	for (i = 0; (res = pnp_get_resource(dev, IORESOURCE_IO, i)); i++) {
+		if (res->flags & IORESOURCE_DISABLED)
+			continue;
 		if (res->start == 0)
 			continue;	/* disabled */
 		if (res->start < 0x100)
_