From 99586424f21220d3a76e9299a7d50d1397aee9a4 Mon Sep 17 00:00:00 2001
From: Adrian Bunk <bunk@kernel.org>
Date: Wed, 16 Jul 2008 19:45:40 +0300
Subject: [PATCH] --- yaml --- r: 106850 b: refs/heads/master c:
 c46acb8e2093779bda393f028099477f98cfef3c h: refs/heads/master v: v3

---
 [refs]                       | 2 +-
 trunk/arch/sh/mm/pg-sh7705.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 3fe3039ebe8c..719a561636d5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cbe9da029d9cc4fff59d559789885079a84a0af8
+refs/heads/master: c46acb8e2093779bda393f028099477f98cfef3c
diff --git a/trunk/arch/sh/mm/pg-sh7705.c b/trunk/arch/sh/mm/pg-sh7705.c
index 7f885b7f8aff..eaf25147194c 100644
--- a/trunk/arch/sh/mm/pg-sh7705.c
+++ b/trunk/arch/sh/mm/pg-sh7705.c
@@ -118,7 +118,7 @@ void copy_user_page(void *to, void *from, unsigned long address, struct page *pg
  * For SH7705, we have our own implementation for ptep_get_and_clear
  * Copied from pg-sh4.c
  */
-inline pte_t ptep_get_and_clear(struct mm_struct *mm, unsigned long addr, pte_t *ptep)
+pte_t ptep_get_and_clear(struct mm_struct *mm, unsigned long addr, pte_t *ptep)
 {
 	pte_t pte = *ptep;