---

yaml --- r: 358381 b: refs/heads/master c: f7ffe19 h: refs/heads/master i: 358379: 278d95c v: v3
git-mirror · Jan 4, 2013 · efb70dd · efb70dd
1 parent 697efaf
commit efb70dd
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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;