aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pci
diff options
context:
space:
mode:
authorBjorn Helgaas <bhelgaas@google.com>2013-01-04 14:13:15 -0500
committerBjorn Helgaas <bhelgaas@google.com>2013-01-04 14:13:15 -0500
commitf7ffe19a6fab14df70bd0acca9a4836aa80b15f5 (patch)
tree8e44323b7d6d0715cc2a8c68294a73828dea3cc1 /drivers/pci
parent7f0d21f937939d05649b95c2ff34c53f6726d11e (diff)
PCI: Use "unsigned long" for __pci_enable_device_flags to match ioport.h
__pci_enable_device_flags() takes values like IORESOURCE_IO and IORESOURCE_MEM, which are values for struct resource.flags, which is "unsigned long", not "resource_size_t". Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Diffstat (limited to 'drivers/pci')
-rw-r--r--drivers/pci/pci.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index 5cb5820fae40..d574fbdbf4b0 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -1157,7 +1157,7 @@ int pci_reenable_device(struct pci_dev *dev)
1157} 1157}
1158 1158
1159static int __pci_enable_device_flags(struct pci_dev *dev, 1159static int __pci_enable_device_flags(struct pci_dev *dev,
1160 resource_size_t flags) 1160 unsigned long flags)
1161{ 1161{
1162 int err; 1162 int err;
1163 int i, bars = 0; 1163 int i, bars = 0;