diff options
| author | Felix Blyakher <felixb@sgi.com> | 2009-04-01 17:58:39 -0400 |
|---|---|---|
| committer | Felix Blyakher <felixb@sgi.com> | 2009-04-01 17:58:39 -0400 |
| commit | f36345ff9a4a77f2cc576a2777b6256d5c8798fa (patch) | |
| tree | 7ae4c607f6baae74060c2e385f744e171fbbf92b /arch/um/sys-ppc/shared/sysdep/syscalls.h | |
| parent | 1aacc064e029f0017384e463121b98f06d3a2cc3 (diff) | |
| parent | 8b53ef33d9d8fa5f771ae11cc6a6e7bc0182beec (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus
Diffstat (limited to 'arch/um/sys-ppc/shared/sysdep/syscalls.h')
| -rw-r--r-- | arch/um/sys-ppc/shared/sysdep/syscalls.h | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/arch/um/sys-ppc/shared/sysdep/syscalls.h b/arch/um/sys-ppc/shared/sysdep/syscalls.h index 679df351e19..1ff81552251 100644 --- a/arch/um/sys-ppc/shared/sysdep/syscalls.h +++ b/arch/um/sys-ppc/shared/sysdep/syscalls.h | |||
| @@ -41,13 +41,3 @@ int old_mmap(unsigned long addr, unsigned long len, | |||
| 41 | 41 | ||
| 42 | #define LAST_ARCH_SYSCALL __NR_fadvise64 | 42 | #define LAST_ARCH_SYSCALL __NR_fadvise64 |
| 43 | 43 | ||
| 44 | /* | ||
| 45 | * Overrides for Emacs so that we follow Linus's tabbing style. | ||
| 46 | * Emacs will notice this stuff at the end of the file and automatically | ||
| 47 | * adjust the settings for this buffer only. This must remain at the end | ||
| 48 | * of the file. | ||
| 49 | * --------------------------------------------------------------------------- | ||
| 50 | * Local variables: | ||
| 51 | * c-file-style: "linux" | ||
| 52 | * End: | ||
| 53 | */ | ||