aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/serial
diff options
context:
space:
mode:
authorWilliam Lee Irwin III <wli@holomorphy.com>2005-06-24 20:06:18 -0700
committerDavid S. Miller <davem@davemloft.net>2005-06-24 20:06:18 -0700
commit37616578539a47d9ace5e907ae73ea93a8cde740 (patch)
treef87060895235cfd69febfa74b59d4c36fcc94534 /drivers/serial
parentb3e112bcc19abd8e9657dca34a87316786e096f3 (diff)
downloadkernel_samsung_smdk4412-37616578539a47d9ace5e907ae73ea93a8cde740.zip
kernel_samsung_smdk4412-37616578539a47d9ace5e907ae73ea93a8cde740.tar.gz
kernel_samsung_smdk4412-37616578539a47d9ace5e907ae73ea93a8cde740.tar.bz2
[SPARC]: sunzilog warning fixes
From: William Lee Irwin III <wli@holomorphy.com> This small patch silences some iomem-related warnings in sunzilog.c by declaring mapped_addr as void __iomem * and inserting a cast in one case. Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/serial')
-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 5c4231a..8e65206 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) {