diff options
| author | David Vrabel <david.vrabel@csr.com> | 2008-10-20 11:07:19 -0400 |
|---|---|---|
| committer | David Vrabel <david.vrabel@csr.com> | 2008-10-20 11:07:19 -0400 |
| commit | 61e0e79ee3c609eb34edf2fe023708cba6a79b1f (patch) | |
| tree | 663deacffd4071120dc9badb70428fe5f124c7b9 /include/asm-mn10300/elf.h | |
| parent | c15895ef30c2c03e99802951787183039a349d32 (diff) | |
| parent | 0cfd81031a26717fe14380d18275f8e217571615 (diff) | |
Merge branch 'master' into for-upstream
Conflicts:
Documentation/ABI/testing/sysfs-bus-usb
drivers/Makefile
Diffstat (limited to 'include/asm-mn10300/elf.h')
| -rw-r--r-- | include/asm-mn10300/elf.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-mn10300/elf.h b/include/asm-mn10300/elf.h index 256a70466ca4..bf09f8bb392e 100644 --- a/include/asm-mn10300/elf.h +++ b/include/asm-mn10300/elf.h | |||
| @@ -141,7 +141,7 @@ do { \ | |||
| 141 | #define ELF_PLATFORM (NULL) | 141 | #define ELF_PLATFORM (NULL) |
| 142 | 142 | ||
| 143 | #ifdef __KERNEL__ | 143 | #ifdef __KERNEL__ |
| 144 | #define SET_PERSONALITY(ex, ibcs2) set_personality(PER_LINUX) | 144 | #define SET_PERSONALITY(ex) set_personality(PER_LINUX) |
| 145 | #endif | 145 | #endif |
| 146 | 146 | ||
| 147 | #endif /* _ASM_ELF_H */ | 147 | #endif /* _ASM_ELF_H */ |