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 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland...
[pandora-kernel.git]
/
arch
/
m68k
/
kernel
/
entry.S
diff --git
a/arch/m68k/kernel/entry.S
b/arch/m68k/kernel/entry.S
index
918f5db
..
6dfa3b3
100644
(file)
--- a/
arch/m68k/kernel/entry.S
+++ b/
arch/m68k/kernel/entry.S
@@
-742,7
+742,7
@@
sys_call_table:
.long sys_epoll_pwait /* 315 */
.long sys_utimensat
.long sys_signalfd
.long sys_epoll_pwait /* 315 */
.long sys_utimensat
.long sys_signalfd
- .long sys_
timerfd
+ .long sys_
ni_syscall
.long sys_eventfd
.long sys_fallocate /* 320 */
.long sys_eventfd
.long sys_fallocate /* 320 */