aboutsummaryrefslogtreecommitdiff
path: root/arch/i386/mm/ioremap.c
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2005-12-21 04:38:01 -0500
committerLen Brown <len.brown@intel.com>2005-12-21 04:38:01 -0500
commitd8bcd8e41576809f276fa44be5012568296cce41 (patch)
treeec48438ed1a7b3d3794a0a4cc577d0bab69b7f03 /arch/i386/mm/ioremap.c
parent5b2db367a28c12e8dfd0b404d9ea35e948c5d7b3 (diff)
parentb05948d9b7167e23af88cc65b9ffa4687eaf1f0d (diff)
Auto-update from upstream
Diffstat (limited to 'arch/i386/mm/ioremap.c')
-rw-r--r--arch/i386/mm/ioremap.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/i386/mm/ioremap.c b/arch/i386/mm/ioremap.c
index 8498b5ac395..247fde76aae 100644
--- a/arch/i386/mm/ioremap.c
+++ b/arch/i386/mm/ioremap.c
@@ -245,7 +245,7 @@ void iounmap(volatile void __iomem *addr)
addr < phys_to_virt(ISA_END_ADDRESS))
return;
- addr = (volatile void *)(PAGE_MASK & (unsigned long __force)addr);
+ addr = (volatile void __iomem *)(PAGE_MASK & (unsigned long __force)addr);
/* Use the vm area unlocked, assuming the caller
ensures there isn't another iounmap for the same address