From ece042e8fee36bb1ac869213dc56815e9830bcca Mon Sep 17 00:00:00 2001
From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Sat, 14 Jan 2012 16:10:53 +0000
Subject: [PATCH] --- yaml --- r: 285879 b: refs/heads/master c:
 a61c2332f8e1939cd4984b63cab641b2366eb428 h: refs/heads/master i:   285877:
 8f2f834451af1b1e0367d32588a2646f168f6cad   285875:
 8d0e94b81ddc1598021706e0279bf5fdf641bc2e   285871:
 21a39b17e8976013fb2c04890f65610b21d1f315 v: v3

---
 [refs]                               | 2 +-
 trunk/arch/arm/mach-sa1100/assabet.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index f2ef1df424f0..187295805762 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 716a3dc20084da9b3ab17bd125005a5345e23e3b
+refs/heads/master: a61c2332f8e1939cd4984b63cab641b2366eb428
diff --git a/trunk/arch/arm/mach-sa1100/assabet.c b/trunk/arch/arm/mach-sa1100/assabet.c
index 6b93e200bcac..0c4b76ab4d8e 100644
--- a/trunk/arch/arm/mach-sa1100/assabet.c
+++ b/trunk/arch/arm/mach-sa1100/assabet.c
@@ -268,7 +268,7 @@ static void __init map_sa1100_gpio_regs( void )
 	int prot = PMD_TYPE_SECT | PMD_SECT_AP_WRITE | PMD_DOMAIN(DOMAIN_IO);
 	pmd_t *pmd;
 
-	pmd = pmd_offset(pgd_offset_k(virt), virt);
+	pmd = pmd_offset(pud_offset(pgd_offset_k(virt), virt), virt);
 	*pmd = __pmd(phys | prot);
 	flush_pmd_entry(pmd);
 }