diff options
author | James Morris <jmorris@namei.org> | 2011-04-19 07:32:41 -0400 |
---|---|---|
committer | James Morris <jmorris@namei.org> | 2011-04-19 07:32:41 -0400 |
commit | d4ab4e6a23f805abb8fc3cc34525eec3788aeca1 (patch) | |
tree | eefd82c155bc27469a85667d759cd90facf4a6e3 /arch/microblaze/lib/memset.c | |
parent | c0fa797ae6cd02ff87c0bfe0d509368a3b45640e (diff) | |
parent | 96fd2d57b8252e16dfacf8941f7a74a6119197f5 (diff) |
Merge branch 'master'; commit 'v2.6.39-rc3' into next
Diffstat (limited to 'arch/microblaze/lib/memset.c')
-rw-r--r-- | arch/microblaze/lib/memset.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/microblaze/lib/memset.c b/arch/microblaze/lib/memset.c index 834565d1607e..ddf67939576d 100644 --- a/arch/microblaze/lib/memset.c +++ b/arch/microblaze/lib/memset.c | |||
@@ -64,7 +64,7 @@ void *memset(void *v_src, int c, __kernel_size_t n) | |||
64 | 64 | ||
65 | if (likely(n >= 4)) { | 65 | if (likely(n >= 4)) { |
66 | /* Align the destination to a word boundary */ | 66 | /* Align the destination to a word boundary */ |
67 | /* This is done in an endian independant manner */ | 67 | /* This is done in an endian independent manner */ |
68 | switch ((unsigned) src & 3) { | 68 | switch ((unsigned) src & 3) { |
69 | case 1: | 69 | case 1: |
70 | *src++ = c; | 70 | *src++ = c; |