diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-07-10 08:17:14 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-07-10 08:17:14 +0200 |
commit | 9e4144abf8a30ae221311368bbb10690ebdb4b76 (patch) | |
tree | 032289d5b7d87976675c1a1a32d512a44d234fa2 /include/linux/audit.h | |
parent | e17ba73b0ee6c0f24393c48b455e0d8db761782c (diff) | |
parent | 6329d3021bcfa9038621e6e917d98929421d8ec8 (diff) | |
download | blackbird-op-linux-9e4144abf8a30ae221311368bbb10690ebdb4b76.tar.gz blackbird-op-linux-9e4144abf8a30ae221311368bbb10690ebdb4b76.zip |
Merge branch 'linus' into core/printk
Conflicts:
kernel/printk.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/linux/audit.h')
-rw-r--r-- | include/linux/audit.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/audit.h b/include/linux/audit.h index 63c3bb98558f..8b82974bdc12 100644 --- a/include/linux/audit.h +++ b/include/linux/audit.h @@ -571,7 +571,7 @@ extern void audit_log_lost(const char *message); extern int audit_update_lsm_rules(void); /* Private API (for audit.c only) */ -extern int audit_filter_user(struct netlink_skb_parms *cb, int type); +extern int audit_filter_user(struct netlink_skb_parms *cb); extern int audit_filter_type(int type); extern int audit_receive_filter(int type, int pid, int uid, int seq, void *data, size_t datasz, uid_t loginuid, |