Merge ../linus

Conflicts:

	drivers/cpufreq/cpufreq.c

1 files changed, 3 insertions, 2 deletions

diff --git a/include/asm-powerpc/pci-bridge.h b/include/asm-powerpc/pci-bridge.h
index 86ee46b09b8a..cb02c9d1ef93 100644
--- 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;