merge by hand - fix up rejections in Documentation/DocBook/Makefile

1 files changed, 0 insertions, 15 deletions

diff --git a/arch/sh64/kernel/sys_sh64.c b/arch/sh64/kernel/sys_sh64.c
index 4546845b9caf..58ff7d522d81 100644
--- a/arch/sh64/kernel/sys_sh64.c
+++ b/arch/sh64/kernel/sys_sh64.c
@@ -283,18 +283,3 @@ asmlinkage int sys_uname(struct old_utsname * name)
         up_read(&uts_sem);
         return err?-EFAULT:0;
 }
-
-/* Copy from mips version */
-asmlinkage long sys_shmatcall(int shmid, char __user *shmaddr,
-                int shmflg)
-{
-        unsigned long raddr;
-        int err;
-
-        err = do_shmat(shmid, shmaddr, shmflg, &raddr);
-        if (err)
-                return err;
-
-        err = raddr;
-        return err;
-}