diff options
Diffstat (limited to 'include/asm-ppc/pci-bridge.h')
-rw-r--r-- | include/asm-ppc/pci-bridge.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/include/asm-ppc/pci-bridge.h b/include/asm-ppc/pci-bridge.h index 9d5230689b31..4d35b844bc58 100644 --- a/include/asm-ppc/pci-bridge.h +++ b/include/asm-ppc/pci-bridge.h | |||
@@ -20,8 +20,8 @@ extern unsigned long pci_bus_mem_base_phys(unsigned int bus); | |||
20 | extern struct pci_controller* pcibios_alloc_controller(void); | 20 | extern struct pci_controller* pcibios_alloc_controller(void); |
21 | 21 | ||
22 | /* Helper function for setting up resources */ | 22 | /* Helper function for setting up resources */ |
23 | extern void pci_init_resource(struct resource *res, unsigned long start, | 23 | extern void pci_init_resource(struct resource *res, resource_size_t start, |
24 | unsigned long end, int flags, char *name); | 24 | resource_size_t end, int flags, char *name); |
25 | 25 | ||
26 | /* Get the PCI host controller for a bus */ | 26 | /* Get the PCI host controller for a bus */ |
27 | extern struct pci_controller* pci_bus_to_hose(int bus); | 27 | extern struct pci_controller* pci_bus_to_hose(int bus); |
@@ -43,18 +43,19 @@ struct pci_controller { | |||
43 | struct pci_controller *next; | 43 | struct pci_controller *next; |
44 | struct pci_bus *bus; | 44 | struct pci_bus *bus; |
45 | void *arch_data; | 45 | void *arch_data; |
46 | struct device *parent; | ||
46 | 47 | ||
47 | int first_busno; | 48 | int first_busno; |
48 | int last_busno; | 49 | int last_busno; |
49 | int bus_offset; | 50 | int bus_offset; |
50 | 51 | ||
51 | void __iomem *io_base_virt; | 52 | void __iomem *io_base_virt; |
52 | unsigned long io_base_phys; | 53 | resource_size_t io_base_phys; |
53 | 54 | ||
54 | /* Some machines (PReP) have a non 1:1 mapping of | 55 | /* Some machines (PReP) have a non 1:1 mapping of |
55 | * the PCI memory space in the CPU bus space | 56 | * the PCI memory space in the CPU bus space |
56 | */ | 57 | */ |
57 | unsigned long pci_mem_offset; | 58 | resource_size_t pci_mem_offset; |
58 | 59 | ||
59 | struct pci_ops *ops; | 60 | struct pci_ops *ops; |
60 | volatile unsigned int __iomem *cfg_addr; | 61 | volatile unsigned int __iomem *cfg_addr; |