aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2007-12-21 15:23:48 +1100
committerPaul Mackerras <paulus@samba.org>2007-12-21 22:14:07 +1100
commit70fbb9388365c3f6f9f17e6501a67f8636e4af08 (patch)
treed766cca599019771ef2964bc5111d36cf2c7f12b /include
parentb91bdd15174ca7104905d74aaf89a6815c3f9d8c (diff)
[POWERPC] Pointers marked as __iomem do not need to be volatile
Fixes this warning: arch/powerpc/platforms/powermac/pci.c: In function 'u3_ht_cfg_access': arch/powerpc/platforms/powermac/pci.c:354: warning: return discards qualifiers from pointer target type arch/powerpc/platforms/powermac/pci.c:358: warning: return discards qualifiers from pointer target type Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'include')
-rw-r--r--include/asm-powerpc/pci-bridge.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-powerpc/pci-bridge.h b/include/asm-powerpc/pci-bridge.h
index 4aeef7f3d76..9b16d3b1716 100644
--- a/include/asm-powerpc/pci-bridge.h
+++ b/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
/*