[PATCH] ANSIfy powerpc floppy.h

[linux-2.6-omap-h63xx.git] / include / asm-powerpc / pci-bridge.h

diff --git a/include/asm-powerpc/pci-bridge.h b/include/asm-powerpc/pci-bridge.h
index 86ee46b09b8a198edbd4b570784492cd921dd979..d9bf5aba96cbd25c262f634410c51275cdb9ecfc 100644 (file)
--- a/include/asm-powerpc/pci-bridge.h
+++ b/include/asm-powerpc/pci-bridge.h
@@ -25,17 +25,18 @@ struct pci_controller {
        int node;
        void *arch_data;
        struct list_head list_node;
+       struct device *parent;
 
        int first_busno;
        int last_busno;
 
        void __iomem *io_base_virt;
-       unsigned long io_base_phys;
+       resource_size_t io_base_phys;
 
        /* Some machines have a non 1:1 mapping of
         * the PCI memory space in the CPU bus space
         */
-       unsigned long pci_mem_offset;
+       resource_size_t pci_mem_offset;
        unsigned long pci_io_size;
 
        struct pci_ops *ops;
@@ -52,6 +53,8 @@ struct pci_controller {
        unsigned long buid;
        unsigned long dma_window_base_cur;
        unsigned long dma_window_size;
+
+       void *private_data;
 };
 
 /*