diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-08-27 10:10:40 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-08-27 10:10:40 -0400 |
| commit | 8f8b77bfdce811acbcf2248219a7aab5f92de938 (patch) | |
| tree | c76c736bdb931d5de55a0de20cd9822d7b48ce8b /arch/alpha/lib/Makefile | |
| parent | d602a064f9818819d6c99d99f101bc6b1ae1540d (diff) | |
| parent | fea7a08acb13524b47711625eebea40a0ede69a0 (diff) | |
Merge 3.6-rc3 into staging-next
This picks up fixes we want in this branch to allow us to properly test.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/alpha/lib/Makefile')
| -rw-r--r-- | arch/alpha/lib/Makefile | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/alpha/lib/Makefile b/arch/alpha/lib/Makefile index c0a83ab62b78..59660743237c 100644 --- a/arch/alpha/lib/Makefile +++ b/arch/alpha/lib/Makefile | |||
| @@ -31,8 +31,6 @@ lib-y = __divqu.o __remqu.o __divlu.o __remlu.o \ | |||
| 31 | $(ev6-y)memchr.o \ | 31 | $(ev6-y)memchr.o \ |
| 32 | $(ev6-y)copy_user.o \ | 32 | $(ev6-y)copy_user.o \ |
| 33 | $(ev6-y)clear_user.o \ | 33 | $(ev6-y)clear_user.o \ |
| 34 | $(ev6-y)strncpy_from_user.o \ | ||
| 35 | $(ev67-y)strlen_user.o \ | ||
| 36 | $(ev6-y)csum_ipv6_magic.o \ | 34 | $(ev6-y)csum_ipv6_magic.o \ |
| 37 | $(ev6-y)clear_page.o \ | 35 | $(ev6-y)clear_page.o \ |
| 38 | $(ev6-y)copy_page.o \ | 36 | $(ev6-y)copy_page.o \ |