From efb70ddd7989928a3a7a38fde6e2fad6f7a2c115 Mon Sep 17 00:00:00 2001
From: Bjorn Helgaas <bhelgaas@google.com>
Date: Fri, 4 Jan 2013 12:13:15 -0700
Subject: [PATCH] --- yaml --- r: 358381 b: refs/heads/master c:
 f7ffe19a6fab14df70bd0acca9a4836aa80b15f5 h: refs/heads/master i:   358379:
 278d95c975578334526babc9da57ff24440c11e2 v: v3

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

diff --git a/[refs] b/[refs]
index 8abccc97ab92..bfb1707930fa 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7f0d21f937939d05649b95c2ff34c53f6726d11e
+refs/heads/master: f7ffe19a6fab14df70bd0acca9a4836aa80b15f5
diff --git a/trunk/drivers/pci/pci.c b/trunk/drivers/pci/pci.c
index 5cb5820fae40..d574fbdbf4b0 100644
--- a/trunk/drivers/pci/pci.c
+++ b/trunk/drivers/pci/pci.c
@@ -1157,7 +1157,7 @@ int pci_reenable_device(struct pci_dev *dev)
 }
 
 static int __pci_enable_device_flags(struct pci_dev *dev,
-				     resource_size_t flags)
+				     unsigned long flags)
 {
 	int err;
 	int i, bars = 0;