Merge branch 'for-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney...

[thirdparty/linux.git] / arch / arm / mach-sa1100 / assabet.c

diff --git a/arch/arm/mach-sa1100/assabet.c b/arch/arm/mach-sa1100/assabet.c
index 0359a66359bd7b31803233e4c4d89d57616cb363..1710ed1a0ac0deac5a22e6287364fa05f500c3f3 100644 (file)
--- a/arch/arm/mach-sa1100/assabet.c
+++ b/arch/arm/mach-sa1100/assabet.c
@@ -364,7 +364,7 @@ static void __init assabet_init(void)
 static void __init map_sa1100_gpio_regs( void )
 {
        unsigned long phys = __PREG(GPLR) & PMD_MASK;
-       unsigned long virt = io_p2v(phys);
+       unsigned long virt = (unsigned long)io_p2v(phys);
        int prot = PMD_TYPE_SECT | PMD_SECT_AP_WRITE | PMD_DOMAIN(DOMAIN_IO);
        pmd_t *pmd;