diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-01-25 14:52:48 +0000 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-01-25 14:52:48 +0000 |
commit | f1487fcbe47cd2bc0c71e8598bf9eb6a82dec544 (patch) | |
tree | 4c7abed6047538c13dd024a8ecffd15f31b4609a /arch/sh/kernel/syscalls_64.S | |
parent | 84549d239ab9bb2e3a85c6efcf0e6478a38b4260 (diff) | |
parent | 40aa7030e5213a43e9e0554fd7f95534ea310bf3 (diff) | |
download | op-kernel-dev-f1487fcbe47cd2bc0c71e8598bf9eb6a82dec544.zip op-kernel-dev-f1487fcbe47cd2bc0c71e8598bf9eb6a82dec544.tar.gz |
Merge branch 'for-2.6.33' into for-2.6.34
Diffstat (limited to 'arch/sh/kernel/syscalls_64.S')
-rw-r--r-- | arch/sh/kernel/syscalls_64.S | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/sh/kernel/syscalls_64.S b/arch/sh/kernel/syscalls_64.S index 07d2aae..2048a20 100644 --- a/arch/sh/kernel/syscalls_64.S +++ b/arch/sh/kernel/syscalls_64.S @@ -392,3 +392,4 @@ sys_call_table: .long sys_rt_tgsigqueueinfo .long sys_perf_event_open .long sys_recvmmsg /* 365 */ + .long sys_accept4 |