diff options
Diffstat (limited to 'arch/parisc/kernel/pci.c')
| -rw-r--r-- | arch/parisc/kernel/pci.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/arch/parisc/kernel/pci.c b/arch/parisc/kernel/pci.c index 88cba49c5301..79c7db2705fd 100644 --- a/arch/parisc/kernel/pci.c +++ b/arch/parisc/kernel/pci.c | |||
| @@ -47,18 +47,17 @@ | |||
| 47 | * this makes the boot time much longer than necessary. | 47 | * this makes the boot time much longer than necessary. |
| 48 | * 20ms seems to work for all the HP PCI implementations to date. | 48 | * 20ms seems to work for all the HP PCI implementations to date. |
| 49 | * | 49 | * |
| 50 | * XXX: turn into a #defined constant in <asm/pci.h> ? | 50 | * #define pci_post_reset_delay 50 |
| 51 | */ | 51 | */ |
| 52 | int pci_post_reset_delay = 50; | ||
| 53 | 52 | ||
| 54 | struct pci_port_ops *pci_port; | 53 | struct pci_port_ops *pci_port __read_mostly; |
| 55 | struct pci_bios_ops *pci_bios; | 54 | struct pci_bios_ops *pci_bios __read_mostly; |
| 56 | 55 | ||
| 57 | int pci_hba_count = 0; | 56 | static int pci_hba_count __read_mostly; |
| 58 | 57 | ||
| 59 | /* parisc_pci_hba used by pci_port->in/out() ops to lookup bus data. */ | 58 | /* parisc_pci_hba used by pci_port->in/out() ops to lookup bus data. */ |
| 60 | #define PCI_HBA_MAX 32 | 59 | #define PCI_HBA_MAX 32 |
| 61 | struct pci_hba_data *parisc_pci_hba[PCI_HBA_MAX]; | 60 | static struct pci_hba_data *parisc_pci_hba[PCI_HBA_MAX] __read_mostly; |
| 62 | 61 | ||
| 63 | 62 | ||
| 64 | /******************************************************************** | 63 | /******************************************************************** |
| @@ -259,8 +258,10 @@ void __devinit pcibios_resource_to_bus(struct pci_dev *dev, | |||
| 259 | void pcibios_bus_to_resource(struct pci_dev *dev, struct resource *res, | 258 | void pcibios_bus_to_resource(struct pci_dev *dev, struct resource *res, |
| 260 | struct pci_bus_region *region) | 259 | struct pci_bus_region *region) |
| 261 | { | 260 | { |
| 261 | #ifdef CONFIG_64BIT | ||
| 262 | struct pci_bus *bus = dev->bus; | 262 | struct pci_bus *bus = dev->bus; |
| 263 | struct pci_hba_data *hba = HBA_DATA(bus->bridge->platform_data); | 263 | struct pci_hba_data *hba = HBA_DATA(bus->bridge->platform_data); |
| 264 | #endif | ||
| 264 | 265 | ||
| 265 | if (res->flags & IORESOURCE_MEM) { | 266 | if (res->flags & IORESOURCE_MEM) { |
| 266 | res->start = PCI_HOST_ADDR(hba, region->start); | 267 | res->start = PCI_HOST_ADDR(hba, region->start); |
