diff --git a/[refs] b/[refs] index c16270d3e685..ffe6c5a14812 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 29263fbf9ecfcf294efdd8a51aa9191f423515ed +refs/heads/master: 76e6a1d6607e5b58003bb87e3b3220d5fdb7568d diff --git a/trunk/drivers/pci/probe.c b/trunk/drivers/pci/probe.c index 1ae9c3f50ffa..0e0401dd02cb 100644 --- a/trunk/drivers/pci/probe.c +++ b/trunk/drivers/pci/probe.c @@ -639,6 +639,8 @@ static void pci_read_irq(struct pci_dev *dev) dev->irq = irq; } +#define LEGACY_IO_RESOURCE (IORESOURCE_IO | IORESOURCE_PCI_FIXED) + /** * pci_setup_device - fill in class and map information of a device * @dev: the device structure to fill @@ -649,9 +651,6 @@ static void pci_read_irq(struct pci_dev *dev) * Returns 0 on success and -1 if unknown type of device (not normal, bridge * or CardBus). */ - -#define LEGACY_IO_RESOURCE (IORESOURCE_IO | IORESOURCE_PCI_FIXED) - static int pci_setup_device(struct pci_dev * dev) { u32 class;