diff options
| author | David S. Miller <davem@davemloft.net> | 2008-09-08 19:59:05 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-09-08 19:59:05 -0400 |
| commit | 17dce5dfe38ae2fb359b61e855f5d8a3a8b7892b (patch) | |
| tree | 88bb1fcf84f9ebfa4299c9a8dcd9e6330b358446 /arch/sh/kernel/sys_sh.c | |
| parent | 712d6954e3998d0de2840d8130941e8042541246 (diff) | |
| parent | 82a28c794f27aac17d7a3ebd7f14d731a11a5532 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
net/mac80211/mlme.c
Diffstat (limited to 'arch/sh/kernel/sys_sh.c')
| -rw-r--r-- | arch/sh/kernel/sys_sh.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sh/kernel/sys_sh.c b/arch/sh/kernel/sys_sh.c index 59cd2859ce9b..9061b86d73fa 100644 --- a/arch/sh/kernel/sys_sh.c +++ b/arch/sh/kernel/sys_sh.c | |||
| @@ -170,7 +170,7 @@ asmlinkage int sys_ipc(uint call, int first, int second, | |||
| 170 | version = call >> 16; /* hack for backward compatibility */ | 170 | version = call >> 16; /* hack for backward compatibility */ |
| 171 | call &= 0xffff; | 171 | call &= 0xffff; |
| 172 | 172 | ||
| 173 | if (call <= SEMCTL) | 173 | if (call <= SEMTIMEDOP) |
| 174 | switch (call) { | 174 | switch (call) { |
| 175 | case SEMOP: | 175 | case SEMOP: |
| 176 | return sys_semtimedop(first, | 176 | return sys_semtimedop(first, |