From 9b4154556dadc75be6c53e493004ca065433fc42 Mon Sep 17 00:00:00 2001
From: Michal Simek <michal.simek@xilinx.com>
Date: Thu, 3 Jan 2013 12:11:59 +0100
Subject: [PATCH] --- yaml --- r: 348260 b: refs/heads/master c:
 ffed2b4f7c04da99ec3a8e8f096c90ea9c0f9956 h: refs/heads/master v: v3

---
 [refs]                                      | 2 +-
 trunk/arch/microblaze/include/asm/highmem.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 3d12d82b721d..ae1f7cb99cd2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7e278157921f95d7313ede005cb07b72b7011962
+refs/heads/master: ffed2b4f7c04da99ec3a8e8f096c90ea9c0f9956
diff --git a/trunk/arch/microblaze/include/asm/highmem.h b/trunk/arch/microblaze/include/asm/highmem.h
index 2446a73140ac..d04638932438 100644
--- a/trunk/arch/microblaze/include/asm/highmem.h
+++ b/trunk/arch/microblaze/include/asm/highmem.h
@@ -71,7 +71,7 @@ static inline void kunmap(struct page *page)
 	kunmap_high(page);
 }
 
-static inline void *__kmap_atomic(struct page *page)
+static inline void *kmap_atomic(struct page *page)
 {
 	return kmap_atomic_prot(page, kmap_prot);
 }