summaryrefslogtreecommitdiffstats
path: root/arch/ppc/syslib/mv64x60.c
diff options
context:
space:
mode:
authorAl Viro <viro@ftp.linux.org.uk>2005-09-29 00:34:30 +0100
committerLinus Torvalds <torvalds@g5.osdl.org>2005-09-29 08:46:27 -0700
commita7625d6e49cb4fd94be7576d85422c33003101b7 (patch)
treeff36979caf0158a5c9a669610309cf6202ace191 /arch/ppc/syslib/mv64x60.c
parent9fcdfcd90526c8c5c2bd117fd3713f8f0f1a46a8 (diff)
downloadtalos-op-linux-a7625d6e49cb4fd94be7576d85422c33003101b7.tar.gz
talos-op-linux-a7625d6e49cb4fd94be7576d85422c33003101b7.zip
[PATCH] mv64x60 iomem annotations
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/ppc/syslib/mv64x60.c')
-rw-r--r--arch/ppc/syslib/mv64x60.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/ppc/syslib/mv64x60.c b/arch/ppc/syslib/mv64x60.c
index 839f8872826f..4849850a59ed 100644
--- a/arch/ppc/syslib/mv64x60.c
+++ b/arch/ppc/syslib/mv64x60.c
@@ -34,7 +34,7 @@ u8 mv64x60_pci_exclude_bridge = 1;
DEFINE_SPINLOCK(mv64x60_lock);
static phys_addr_t mv64x60_bridge_pbase;
-static void *mv64x60_bridge_vbase;
+static void __iomem *mv64x60_bridge_vbase;
static u32 mv64x60_bridge_type = MV64x60_TYPE_INVALID;
static u32 mv64x60_bridge_rev;
#if defined(CONFIG_SYSFS) && !defined(CONFIG_GT64260)
@@ -938,7 +938,7 @@ mv64x60_setup_for_chip(struct mv64x60_handle *bh)
*
* Return the virtual address of the bridge's registers.
*/
-void *
+void __iomem *
mv64x60_get_bridge_vbase(void)
{
return mv64x60_bridge_vbase;
OpenPOWER on IntegriCloud