diff --git a/[refs] b/[refs] index 665038c950ad..ffd88208fa93 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b91bdd15174ca7104905d74aaf89a6815c3f9d8c +refs/heads/master: 70fbb9388365c3f6f9f17e6501a67f8636e4af08 diff --git a/trunk/include/asm-powerpc/pci-bridge.h b/trunk/include/asm-powerpc/pci-bridge.h index 4aeef7f3d766..9b16d3b17169 100644 --- a/trunk/include/asm-powerpc/pci-bridge.h +++ b/trunk/include/asm-powerpc/pci-bridge.h @@ -75,8 +75,8 @@ struct pci_controller { #endif struct pci_ops *ops; - volatile unsigned int __iomem *cfg_addr; - volatile void __iomem *cfg_data; + unsigned int __iomem *cfg_addr; + void __iomem *cfg_data; #ifndef CONFIG_PPC64 /*