summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorAlexander Viro <viro@parcelfarce.linux.theplanet.co.uk>2004-12-28 18:43:28 -0800
committerLinus Torvalds <torvalds@ppc970.osdl.org>2004-12-28 18:43:28 -0800
commitd70e75637caeba4bfb5c35ed16379d0e4c1a2b68 (patch)
treec01c7ffc8e7d8638415974153a4807797d62d3d1 /include
parent11a39304d8a7453b59b51f0dcca32b2658095084 (diff)
[PATCH] ppc __iomem annotations - ->cfg_addr
->cfg_addr is an iomem pointer; annotated as such, setup_indirect_pci() cleaned up. Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include')
-rw-r--r--include/asm-ppc/pci-bridge.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-ppc/pci-bridge.h b/include/asm-ppc/pci-bridge.h
index 727421e8b17b..78e9be619f14 100644
--- a/include/asm-ppc/pci-bridge.h
+++ b/include/asm-ppc/pci-bridge.h
@@ -57,7 +57,7 @@ struct pci_controller {
unsigned long pci_mem_offset;
struct pci_ops *ops;
- volatile unsigned int *cfg_addr;
+ volatile unsigned int __iomem *cfg_addr;
volatile void __iomem *cfg_data;
/*
* If set, indirect method will set the cfg_type bit as
@@ -95,7 +95,7 @@ int early_write_config_dword(struct pci_controller *hose, int bus, int dev_fn,
int where, u32 val);
extern void setup_indirect_pci_nomap(struct pci_controller* hose,
- u32 cfg_addr, u32 cfg_data);
+ void __iomem *cfg_addr, void __iomem *cfg_data);
extern void setup_indirect_pci(struct pci_controller* hose,
u32 cfg_addr, u32 cfg_data);
extern void setup_grackle(struct pci_controller *hose);