From 1ab74f079324274abf6e840ec9876649eecc29f8 Mon Sep 17 00:00:00 2001
From: Bjorn Helgaas <bjorn.helgaas@hp.com>
Date: Mon, 2 Jun 2008 16:42:49 -0600
Subject: [PATCH] --- yaml --- r: 97563 b: refs/heads/master c:
 4b34fe156455d26ee6ed67b61539f136bf4e439c h: refs/heads/master i:   97561:
 f133ab05c5f02c3037cc75b6272310574bad9fef   97559:
 9cab9f9818576cad9fa238b173b770e781b914d3 v: v3

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

diff --git a/[refs] b/[refs]
index 331768c34e8d..0186e261e582 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c3b25b32e8bef526cca748e1ba023c6bdd705a99
+refs/heads/master: 4b34fe156455d26ee6ed67b61539f136bf4e439c
diff --git a/trunk/drivers/pnp/quirks.c b/trunk/drivers/pnp/quirks.c
index e2b7de4cb05e..1ff3bb585ab2 100644
--- a/trunk/drivers/pnp/quirks.c
+++ b/trunk/drivers/pnp/quirks.c
@@ -286,7 +286,7 @@ static void quirk_system_pci_resources(struct pnp_dev *dev)
 					pci_name(pdev), i,
 					(unsigned long long) pci_start,
 					(unsigned long long) pci_end);
-				res->flags = 0;
+				res->flags |= IORESOURCE_DISABLED;
 			}
 		}
 	}
diff --git a/trunk/drivers/pnp/system.c b/trunk/drivers/pnp/system.c
index 9c2496dbeee4..8f0a570509c5 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_UNSET)
+		if (res->flags & IORESOURCE_DISABLED)
 			continue;
 
 		reserve_range(dev, res->start, res->end, 0);