summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-25 10:25:13 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-25 10:25:13 -0700
commit43df5eac00734436e2bc5a5c11488b1a7accecc7 (patch)
treec830ffbdea3c6ab00f31afeedc26392bd4a55d63 /drivers
parent7be426c6e3a8ad7dcc8791589cea8af7aaafdf6f (diff)
parente55c57e0b51c68d78845549505057169c6c3cba6 (diff)
downloadlinux-43df5eac00734436e2bc5a5c11488b1a7accecc7.tar.gz
linux-43df5eac00734436e2bc5a5c11488b1a7accecc7.tar.bz2
linux-43df5eac00734436e2bc5a5c11488b1a7accecc7.zip
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
Diffstat (limited to 'drivers')
-rw-r--r--drivers/serial/sunzilog.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/serial/sunzilog.c b/drivers/serial/sunzilog.c
index 5c4231ae295b..8e65206d3d76 100644
--- a/drivers/serial/sunzilog.c
+++ b/drivers/serial/sunzilog.c
@@ -1071,7 +1071,7 @@ static void __init sunzilog_alloc_tables(void)
*/
static struct zilog_layout __iomem * __init get_zs_sun4u(int chip, int zsnode)
{
- unsigned long mapped_addr;
+ void __iomem *mapped_addr;
unsigned int sun4u_ino;
struct sbus_bus *sbus = NULL;
struct sbus_dev *sdev = NULL;
@@ -1111,9 +1111,9 @@ static struct zilog_layout __iomem * __init get_zs_sun4u(int chip, int zsnode)
apply_fhc_ranges(central_bus->child,
&zsregs[0], 1);
apply_central_ranges(central_bus, &zsregs[0], 1);
- mapped_addr =
- (((u64)zsregs[0].which_io)<<32UL) |
- ((u64)zsregs[0].phys_addr);
+ mapped_addr = (void __iomem *)
+ ((((u64)zsregs[0].which_io)<<32UL) |
+ ((u64)zsregs[0].phys_addr));
}
if (zilog_irq == -1) {