Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-arm

[platform/kernel/linux-rpi.git] / arch / arm / mm / highmem.c

diff --git a/arch/arm/mm/highmem.c b/arch/arm/mm/highmem.c
index 3a9e8aa..21b9e1b 100644 (file)
--- a/arch/arm/mm/highmem.c
+++ b/arch/arm/mm/highmem.c
@@ -36,7 +36,7 @@ void kunmap(struct page *page)
 }
 EXPORT_SYMBOL(kunmap);
 
-void *__kmap_atomic(struct page *page)
+void *kmap_atomic(struct page *page)
 {
        unsigned int idx;
        unsigned long vaddr;
@@ -80,7 +80,7 @@ void *__kmap_atomic(struct page *page)
 
        return (void *)vaddr;
 }
-EXPORT_SYMBOL(__kmap_atomic);
+EXPORT_SYMBOL(kmap_atomic);
 
 void __kunmap_atomic(void *kvaddr)
 {