diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-10-17 12:25:43 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-10-17 12:25:43 +0200 |
| commit | 0f1f6dec9593c8319714c927dafb443548a1452a (patch) | |
| tree | 74f887dc86747523e82f08900501073f451996cc /include/asm-um/elf-i386.h | |
| parent | sched: only update rq->clock while holding rq->lock (diff) | |
| parent | {pci,pnp} quirks.c: don't use deprecated print_fn_descriptor_symbol() (diff) | |
| download | linux-0f1f6dec9593c8319714c927dafb443548a1452a.tar.xz linux-0f1f6dec9593c8319714c927dafb443548a1452a.zip | |
Merge branch 'linus' into sched/urgent
Diffstat (limited to 'include/asm-um/elf-i386.h')
| -rw-r--r-- | include/asm-um/elf-i386.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-um/elf-i386.h b/include/asm-um/elf-i386.h index 23d6893e8617..d0da9d7c5371 100644 --- a/include/asm-um/elf-i386.h +++ b/include/asm-um/elf-i386.h @@ -86,7 +86,7 @@ extern long elf_aux_hwcap; extern char * elf_aux_platform; #define ELF_PLATFORM (elf_aux_platform) -#define SET_PERSONALITY(ex, ibcs2) do { } while (0) +#define SET_PERSONALITY(ex) do { } while (0) extern unsigned long vsyscall_ehdr; extern unsigned long vsyscall_end; |