git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'linux-next' of git://git.infradead.org/ubi-2.6
[pandora-kernel.git]
/
include
/
asm-m32r
/
unistd.h
diff --git
a/include/asm-m32r/unistd.h
b/include/asm-m32r/unistd.h
index
f467eac
..
cf701c9
100644
(file)
--- a/
include/asm-m32r/unistd.h
+++ b/
include/asm-m32r/unistd.h
@@
-327,7
+327,7
@@
#define __NR_epoll_pwait 319
#define __NR_utimensat 320
#define __NR_signalfd 321
-#define __NR_timerfd 322
+/* #define __NR_timerfd 322 removed */
#define __NR_eventfd 323
#define __NR_fallocate 324