commit ea56f411ec2d4d8689eb7f3bcd24e860acf87c47
author David Howells <dhowells@redhat.com> Tue Apr 06 14:35:08 2010 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> Wed Apr 07 08:38:05 2010 -0700
tree 6c0862001b4974e460300d884cc6b6310102a3eb
parent c783a29efcbc90a90ccfec8956c7ff0854301c34

frv: hide uncached_access() when pgprot_noncached is not #defined

Hide uncached_access() when pgprot_noncached is not #defined.  This prevents
the following warning:

	  CC      drivers/char/mem.o
	drivers/char/mem.c:229: warning: 'uncached_access' defined but not used

Repairs d7d4d849b4e3acc405ec222884936800ffb26d48 ("drivers/char/mem.c:
cleanups").

Signed-off-by: David Howells <dhowells@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

drivers/char/mem.c

diff --git a/drivers/char/mem.c b/drivers/char/mem.c
index 9cdbadc6..f54dab8 100644
--- a/drivers/char/mem.c
+++ b/drivers/char/mem.c
@@ -225,6 +225,7 @@
  * outside of main memory.
  *
  */
+#ifdef pgprot_noncached
 static int uncached_access(struct file *file, unsigned long addr)
 {
 #if defined(CONFIG_IA64)
@@ -251,6 +252,7 @@
 	return addr >= __pa(high_memory);
 #endif
 }
+#endif
 
 static pgprot_t phys_mem_access_prot(struct file *file, unsigned long pfn,
 				     unsigned long size, pgprot_t vma_prot)