diff options
author | Tony Lindgren <tony@atomide.com> | 2011-06-14 08:53:42 -0400 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2011-06-14 08:53:42 -0400 |
commit | b8ce9fb8e18af7466e0b915bb5979322cdace322 (patch) | |
tree | eec6f9b58ce154fd863f0f78b374a697a5a7139b /arch/sparc/kernel/module.c | |
parent | c8e0bf95fc01d6e2ca585fe08010800b6c56e823 (diff) | |
parent | e9e35c5a2b2c803b5e2f25906d8ffe110670ceb6 (diff) |
Merge branch 'fixes-v3.0-rc3' into devel-fixes
Diffstat (limited to 'arch/sparc/kernel/module.c')
-rw-r--r-- | arch/sparc/kernel/module.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sparc/kernel/module.c b/arch/sparc/kernel/module.c index 8d348c474a2f..99ba5baa9497 100644 --- a/arch/sparc/kernel/module.c +++ b/arch/sparc/kernel/module.c | |||
@@ -214,7 +214,7 @@ int apply_relocate_add(Elf_Shdr *sechdrs, | |||
214 | me->name, | 214 | me->name, |
215 | (int) (ELF_R_TYPE(rel[i].r_info) & 0xff)); | 215 | (int) (ELF_R_TYPE(rel[i].r_info) & 0xff)); |
216 | return -ENOEXEC; | 216 | return -ENOEXEC; |
217 | }; | 217 | } |
218 | } | 218 | } |
219 | return 0; | 219 | return 0; |
220 | } | 220 | } |