diff --git a/[refs] b/[refs] index 209e47dfb31d..2211ac53083c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: dfff0fa65ab15db45acd64b3189787d37ab163cd +refs/heads/master: 221c007b028ebf663ebee4fc90483909547d92a7 diff --git a/trunk/arch/sh/lib/Makefile b/trunk/arch/sh/lib/Makefile index c2b28d8b2dd1..a969b47c5463 100644 --- a/trunk/arch/sh/lib/Makefile +++ b/trunk/arch/sh/lib/Makefile @@ -23,7 +23,7 @@ obj-y += io.o memcpy-y := memcpy.o memcpy-$(CONFIG_CPU_SH4) := memcpy-sh4.o -lib-$(CONFIG_MMU) += copy_page.o clear_page.o +lib-$(CONFIG_MMU) += copy_page.o __clear_user.o lib-$(CONFIG_MCOUNT) += mcount.o lib-y += $(memcpy-y) $(udivsi3-y) diff --git a/trunk/arch/sh/lib/clear_page.S b/trunk/arch/sh/lib/__clear_user.S similarity index 100% rename from trunk/arch/sh/lib/clear_page.S rename to trunk/arch/sh/lib/__clear_user.S