Merge branch 'linux-2.6'

1 files changed, 3 insertions, 2 deletions

diff --git a/arch/sh/lib/Makefile b/arch/sh/lib/Makefile
index 9dc7b6985052..ebb55d1149f5 100644
--- a/arch/sh/lib/Makefile
+++ b/arch/sh/lib/Makefile
@@ -2,12 +2,13 @@
 # Makefile for SuperH-specific library files..
 #
 
-lib-y  = delay.o memset.o memmove.o memchr.o \
+lib-y  = delay.o io.o memset.o memmove.o memchr.o \
          checksum.o strlen.o div64.o div64-generic.o
 
 memcpy-y                        := memcpy.o
 memcpy-$(CONFIG_CPU_SH4)        := memcpy-sh4.o
 
-lib-y   += $(memcpy-y)
+lib-$(CONFIG_MMU)               += copy_page.o clear_page.o
+lib-y                           += $(memcpy-y)
 
 EXTRA_CFLAGS += -Werror