From 2489a17a629a8990576459455295d5d7012098b2 Mon Sep 17 00:00:00 2001
From: Bjorn Helgaas <bjorn.helgaas@hp.com>
Date: Thu, 5 Jun 2008 10:32:23 -0600
Subject: [PATCH] --- yaml --- r: 97692 b: refs/heads/master c:
 5a515bcbea580a65ced92405b083299df9003748 h: refs/heads/master v: v3

---
 [refs]                     | 2 +-
 trunk/drivers/pnp/system.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 232216c354e4..03d84d95f24c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6311c90a9ea16b4ab93ed48f1a9022647f6b3c43
+refs/heads/master: 5a515bcbea580a65ced92405b083299df9003748
diff --git a/trunk/drivers/pnp/system.c b/trunk/drivers/pnp/system.c
index 8f0a570509c5..cf4e07b01d48 100644
--- a/trunk/drivers/pnp/system.c
+++ b/trunk/drivers/pnp/system.c
@@ -81,7 +81,7 @@ static void reserve_resources_of_dev(struct pnp_dev *dev)
 	}
 
 	for (i = 0; (res = pnp_get_resource(dev, IORESOURCE_MEM, i)); i++) {
-		if (res->flags & IORESOURCE_DISABLED)
+		if (res->flags & (IORESOURCE_UNSET | IORESOURCE_DISABLED))
 			continue;
 
 		reserve_range(dev, res->start, res->end, 0);