diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-18 16:07:27 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-18 16:07:27 -0700 |
commit | fbeb1f19229baa9ee80f315e9d24635045455082 (patch) | |
tree | dc7bd3f3d9c289293f9ed11d0ff3b506444285b0 /include/asm-sh/unistd.h | |
parent | 5851fadce8824d5d4b8fd02c22ae098401f6489e (diff) | |
parent | 0b3d4ef6fe43b75d4b2a6fc4b814cf03aa248e13 (diff) |
Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6:
serial: Fix sh-sci break interrupt/sysrq handling.
sh: Fix bogus regs pointer in do_IRQ().
sh: Fix SH-3 cache entry_mask and way_size calculation.
sh: Convert struct ioctls to static defines.
sh: Define missing __NR_readahead.
sh: Fix PCI BAR address-space wraparound.
Diffstat (limited to 'include/asm-sh/unistd.h')
-rw-r--r-- | include/asm-sh/unistd.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/asm-sh/unistd.h b/include/asm-sh/unistd.h index 17f527bfd45..49be50a36b7 100644 --- a/include/asm-sh/unistd.h +++ b/include/asm-sh/unistd.h @@ -233,6 +233,7 @@ #define __NR_fcntl64 221 /* 223 is unused */ #define __NR_gettid 224 +#define __NR_readahead 225 #define __NR_setxattr 226 #define __NR_lsetxattr 227 #define __NR_fsetxattr 228 |