aboutsummaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorAl Viro <viro@www.linux.org.uk>2005-04-24 14:58:08 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-04-24 14:58:08 -0700
commite2178f199b341cc3e3ac86be50a54b0d8d8a132f (patch)
treebfed621277dc03364b69028fd2bb47c6deab32f4 /arch
parent28a6815979b4eff29956549d62f72582a81f041e (diff)
[PATCH] ppc trivial iomem annotations: chrp
Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/ppc/platforms/chrp_pci.c7
-rw-r--r--arch/ppc/platforms/chrp_setup.c2
2 files changed, 5 insertions, 4 deletions
diff --git a/arch/ppc/platforms/chrp_pci.c b/arch/ppc/platforms/chrp_pci.c
index 5bb6492ecf8..7d0ee308f66 100644
--- a/arch/ppc/platforms/chrp_pci.c
+++ b/arch/ppc/platforms/chrp_pci.c
@@ -129,7 +129,7 @@ static struct pci_ops rtas_pci_ops =
rtas_write_config
};
-volatile struct Hydra *Hydra = NULL;
+volatile struct Hydra __iomem *Hydra = NULL;
int __init
hydra_init(void)
@@ -175,13 +175,14 @@ chrp_pcibios_fixup(void)
static void __init
setup_python(struct pci_controller *hose, struct device_node *dev)
{
- u32 *reg, val;
+ u32 __iomem *reg;
+ u32 val;
unsigned long addr = dev->addrs[0].address;
setup_indirect_pci(hose, addr + 0xf8000, addr + 0xf8010);
/* Clear the magic go-slow bit */
- reg = (u32 *) ioremap(dev->addrs[0].address + 0xf6000, 0x40);
+ reg = ioremap(dev->addrs[0].address + 0xf6000, 0x40);
val = in_be32(&reg[12]);
if (val & PRG_CL_RESET_VALID) {
out_be32(&reg[12], val & ~PRG_CL_RESET_VALID);
diff --git a/arch/ppc/platforms/chrp_setup.c b/arch/ppc/platforms/chrp_setup.c
index f23c4f32076..57f29ab29bd 100644
--- a/arch/ppc/platforms/chrp_setup.c
+++ b/arch/ppc/platforms/chrp_setup.c
@@ -356,7 +356,7 @@ static void __init chrp_find_openpic(void)
struct device_node *np;
int len, i;
unsigned int *iranges;
- void *isu;
+ void __iomem *isu;
np = find_type_devices("open-pic");
if (np == NULL || np->n_addrs == 0)