diff options
| author | David S. Miller <davem@davemloft.net> | 2011-09-22 03:23:13 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-09-22 03:23:13 -0400 |
| commit | 8decf868790b48a727d7e7ca164f2bcd3c1389c0 (patch) | |
| tree | b759a5f861f842af7ea76f9011b579d06e9d5508 /kernel/sys_ni.c | |
| parent | 3fc72370186be2f9d4d6ef06d99e1caa5d92c564 (diff) | |
| parent | d93dc5c4478c1fd5de85a3e8aece9aad7bbae044 (diff) | |
Merge branch 'master' of github.com:davem330/net
Conflicts:
MAINTAINERS
drivers/net/Kconfig
drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c
drivers/net/ethernet/broadcom/tg3.c
drivers/net/wireless/iwlwifi/iwl-pci.c
drivers/net/wireless/iwlwifi/iwl-trans-tx-pcie.c
drivers/net/wireless/rt2x00/rt2800usb.c
drivers/net/wireless/wl12xx/main.c
Diffstat (limited to 'kernel/sys_ni.c')
| -rw-r--r-- | kernel/sys_ni.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/kernel/sys_ni.c b/kernel/sys_ni.c index 62cbc8877fe..a9a5de07c4f 100644 --- a/kernel/sys_ni.c +++ b/kernel/sys_ni.c | |||
| @@ -16,7 +16,6 @@ asmlinkage long sys_ni_syscall(void) | |||
| 16 | return -ENOSYS; | 16 | return -ENOSYS; |
| 17 | } | 17 | } |
| 18 | 18 | ||
| 19 | cond_syscall(sys_nfsservctl); | ||
| 20 | cond_syscall(sys_quotactl); | 19 | cond_syscall(sys_quotactl); |
| 21 | cond_syscall(sys32_quotactl); | 20 | cond_syscall(sys32_quotactl); |
| 22 | cond_syscall(sys_acct); | 21 | cond_syscall(sys_acct); |