Merge nuts.davemloft.net:/disk1/BK/sparcwork-2.6

into nuts.davemloft.net:/disk1/BK/sparc-2.6

Merge nuts.davemloft.net:/disk1/BK/sparcwork-2.6
into nuts.davemloft.net:/disk1/BK/sparc-2.6
0c0cacdc · David S. Miller · b2d271d9 · 505fc148 · 0c0cacdc
Commit 0c0cacdc authored Mar 02, 2004 by David S. Miller
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 1 deletion

include/asm-sparc/unistd.h include/asm-sparc/unistd.h +0 -1

No files found.
--- a/include/asm-sparc/unistd.h
+++ b/include/asm-sparc/unistd.h
@@ -461,7 +461,6 @@ asmlinkage unsigned long sys_mmap2(
 				unsigned long addr, unsigned long len,
 				unsigned long prot, unsigned long flags,
 				unsigned long fd, unsigned long pgoff);
-asmlinkage int sys_ioperm(unsigned long from, unsigned long num, int on);
 struct sigaction;
 asmlinkage long sys_rt_sigaction(int sig,
 				const struct sigaction __user *act,