diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2008-10-21 11:12:00 +0100 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2008-10-21 11:12:00 +0100 |
| commit | c3380942e6699ed5b3e3f37b49ceb724b7699813 (patch) | |
| tree | 516d791cdfd1c7f99a29f71e1a7bba8f75af96e1 /include/asm-um/elf-x86_64.h | |
| parent | 0ffda6cca2c66e42d0ad65719f58c637ed180b05 (diff) | |
| parent | 2515ddc6db8eb49a79f0fe5e67ff09ac7c81eab4 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into s3c64xx
Diffstat (limited to 'include/asm-um/elf-x86_64.h')
| -rw-r--r-- | include/asm-um/elf-x86_64.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-um/elf-x86_64.h b/include/asm-um/elf-x86_64.h index 3b2d5224a7e..6e8a9195e95 100644 --- a/include/asm-um/elf-x86_64.h +++ b/include/asm-um/elf-x86_64.h @@ -114,6 +114,6 @@ extern long elf_aux_hwcap; #define ELF_PLATFORM "x86_64" -#define SET_PERSONALITY(ex, ibcs2) do ; while(0) +#define SET_PERSONALITY(ex) do ; while(0) #endif |