diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2006-10-01 18:55:53 +0200 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2006-10-01 18:55:53 +0200 |
| commit | 8a84fc15ae5cafcc366dd85cf8e1ab2040679abc (patch) | |
| tree | 5d8dce194c9667fa92e9ec9f545cec867a9a1e0d /include/asm-generic/audit_change_attr.h | |
| parent | [MTD ONENAND] Check OneNAND lock scheme & all block unlock command support (diff) | |
| parent | Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart (diff) | |
| download | linux-8a84fc15ae5cafcc366dd85cf8e1ab2040679abc.tar.xz linux-8a84fc15ae5cafcc366dd85cf8e1ab2040679abc.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Manually resolve conflict in include/mtd/Kbuild
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Diffstat (limited to 'include/asm-generic/audit_change_attr.h')
| -rw-r--r-- | include/asm-generic/audit_change_attr.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/asm-generic/audit_change_attr.h b/include/asm-generic/audit_change_attr.h index cb05bf69745a..50764550a60c 100644 --- a/include/asm-generic/audit_change_attr.h +++ b/include/asm-generic/audit_change_attr.h @@ -1,16 +1,20 @@ __NR_chmod, __NR_fchmod, +#ifdef __NR_chown __NR_chown, __NR_fchown, __NR_lchown, +#endif __NR_setxattr, __NR_lsetxattr, __NR_fsetxattr, __NR_removexattr, __NR_lremovexattr, __NR_fremovexattr, +#ifdef __NR_fchownat __NR_fchownat, __NR_fchmodat, +#endif #ifdef __NR_chown32 __NR_chown32, __NR_fchown32, |