From efb2c4ad61efcf63d6a1deb26e2c5d142056bdb9 Mon Sep 17 00:00:00 2001
From: Nicolas Pitre <nicolas.pitre@linaro.org>
Date: Wed, 14 Sep 2011 15:14:19 -0400
Subject: [PATCH] --- yaml --- r: 279864 b: refs/heads/master c:
 8da54a0b47a0c3f2cbb31e92472d5d3887b620b8 h: refs/heads/master v: v3

---
 [refs]                                        | 2 +-
 trunk/arch/arm/mach-prima2/include/mach/map.h | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 79e21f058610..eba8075f7a72 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1a4c1c966958ec602c5efd46eb2e53a9cb17f5e4
+refs/heads/master: 8da54a0b47a0c3f2cbb31e92472d5d3887b620b8
diff --git a/trunk/arch/arm/mach-prima2/include/mach/map.h b/trunk/arch/arm/mach-prima2/include/mach/map.h
index 66b1ae2e553f..6f243532570c 100644
--- a/trunk/arch/arm/mach-prima2/include/mach/map.h
+++ b/trunk/arch/arm/mach-prima2/include/mach/map.h
@@ -9,8 +9,10 @@
 #ifndef __MACH_PRIMA2_MAP_H__
 #define __MACH_PRIMA2_MAP_H__
 
-#include <mach/vmalloc.h>
+#include <linux/const.h>
 
-#define SIRFSOC_VA(x)			(VMALLOC_END + ((x) & 0x00FFF000))
+#define SIRFSOC_VA_BASE		_AC(0xFEC00000, UL)
+
+#define SIRFSOC_VA(x)		(SIRFSOC_VA_BASE + ((x) & 0x00FFF000))
 
 #endif