diff options
| author | David S. Miller <davem@davemloft.net> | 2008-12-15 23:03:50 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-12-15 23:03:50 -0500 |
| commit | eb14f019597cd86c21a6c601d7e900f40030c2e7 (patch) | |
| tree | 36fb2f36a1747f98988f87215db1eef3a71d45eb /include/asm-generic/audit_write.h | |
| parent | 9a4a84294b0d60b8c287131478f743ba2bc68949 (diff) | |
| parent | a3dd15444baa9c7522c8457ab564c41219dfb44c (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/e1000e/ich8lan.c
Diffstat (limited to 'include/asm-generic/audit_write.h')
| -rw-r--r-- | include/asm-generic/audit_write.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/asm-generic/audit_write.h b/include/asm-generic/audit_write.h index f10d367fb2a5..c5f1c2c920e2 100644 --- a/include/asm-generic/audit_write.h +++ b/include/asm-generic/audit_write.h | |||
| @@ -1,6 +1,8 @@ | |||
| 1 | #include <asm-generic/audit_dir_write.h> | 1 | #include <asm-generic/audit_dir_write.h> |
| 2 | __NR_acct, | 2 | __NR_acct, |
| 3 | #ifdef __NR_swapon | ||
| 3 | __NR_swapon, | 4 | __NR_swapon, |
| 5 | #endif | ||
| 4 | __NR_quotactl, | 6 | __NR_quotactl, |
| 5 | __NR_truncate, | 7 | __NR_truncate, |
| 6 | #ifdef __NR_truncate64 | 8 | #ifdef __NR_truncate64 |