diff options
| author | James Morris <jmorris@namei.org> | 2011-03-07 18:55:06 -0500 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2011-03-07 18:55:06 -0500 |
| commit | 1cc26bada9f6807814806db2f0d78792eecdac71 (patch) | |
| tree | 5509b5139db04af6c13db0a580c84116a4a54039 /include/linux/audit.h | |
| parent | eae61f3c829439f8f9121b5cd48a14be04df451f (diff) | |
| parent | 214d93b02c4fe93638ad268613c9702a81ed9192 (diff) | |
Merge branch 'master'; commit 'v2.6.38-rc7' into next
Diffstat (limited to 'include/linux/audit.h')
| -rw-r--r-- | include/linux/audit.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/audit.h b/include/linux/audit.h index 8b5c0620abf9..359df0487690 100644 --- a/include/linux/audit.h +++ b/include/linux/audit.h | |||
| @@ -372,6 +372,7 @@ struct audit_buffer; | |||
| 372 | struct audit_context; | 372 | struct audit_context; |
| 373 | struct inode; | 373 | struct inode; |
| 374 | struct netlink_skb_parms; | 374 | struct netlink_skb_parms; |
| 375 | struct path; | ||
| 375 | struct linux_binprm; | 376 | struct linux_binprm; |
| 376 | struct mq_attr; | 377 | struct mq_attr; |
| 377 | struct mqstat; | 378 | struct mqstat; |