From: David Howells <dhowells@redhat.com>

Make lib/ioremap.c conditional on !CONFIG_MMU.  It plays with PTEs which don't
exist under NOMMU conditions.

Signed-off-by: David Howells <dhowells@redhat.com>
Cc: Haavard Skinnemoen <hskinnemoen@atmel.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 lib/Makefile |    3 ++-
 1 files changed, 2 insertions(+), 1 deletion(-)

diff -puN lib/Makefile~generic-ioremap_page_range-implementation-nommu-fix lib/Makefile
--- a/lib/Makefile~generic-ioremap_page_range-implementation-nommu-fix
+++ a/lib/Makefile
@@ -5,8 +5,9 @@
 lib-y := errno.o ctype.o string.o vsprintf.o cmdline.o \
 	 bust_spinlocks.o rbtree.o radix-tree.o dump_stack.o \
 	 idr.o div64.o int_sqrt.o bitmap.o extable.o prio_tree.o \
-	 sha1.o ioremap.o
+	 sha1.o
 
+lib-$(CONFIG_MMU) += ioremap.o
 lib-$(CONFIG_SMP) += cpumask.o
 
 lib-y	+= kobject.o kref.o kobject_uevent.o klist.o
_