diff options
| author | David S. Miller <davem@nuts.davemloft.net> | 2004-03-03 07:30:23 -0800 |
|---|---|---|
| committer | David S. Miller <davem@nuts.davemloft.net> | 2004-03-03 07:30:23 -0800 |
| commit | dbbffa7ba20b30876f7916143f1f1248339bf716 (patch) | |
| tree | dbaeb03555bd39ac53767b3f7a14c08e1a5969de /include | |
| parent | 89fb030dc397f63c027832ee7de14472b4296fd7 (diff) | |
| parent | fed66598b66f26f5460f64aa0e08472e9d7b4a47 (diff) | |
Merge nuts.davemloft.net:/disk1/BK/sparcwork-2.6
into nuts.davemloft.net:/disk1/BK/sparc-2.6
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-sparc/unistd.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/asm-sparc/unistd.h b/include/asm-sparc/unistd.h index 7998eae7da40..61462b047419 100644 --- 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, |