diff options
| author | Takashi Iwai <tiwai@suse.de> | 2012-01-31 09:13:14 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2012-01-31 09:13:14 -0500 |
| commit | ea51e5040e24eefe44d70bc654a237ca1f0225b0 (patch) | |
| tree | df2e5922dcdfafae62a10d8cd97f98121064fc23 /include/linux/ipc.h | |
| parent | 3422a47041b8cb8f14ac1e3926bcf711121df6dc (diff) | |
| parent | 8dbd52daee38adaae4d5a674bcca837e694a4f4c (diff) | |
Merge branch 'fix/asoc' into for-linus
Diffstat (limited to 'include/linux/ipc.h')
| -rw-r--r-- | include/linux/ipc.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/ipc.h b/include/linux/ipc.h index 3b1594d662b0..30e816148df4 100644 --- a/include/linux/ipc.h +++ b/include/linux/ipc.h | |||
| @@ -93,7 +93,7 @@ struct kern_ipc_perm | |||
| 93 | gid_t gid; | 93 | gid_t gid; |
| 94 | uid_t cuid; | 94 | uid_t cuid; |
| 95 | gid_t cgid; | 95 | gid_t cgid; |
| 96 | mode_t mode; | 96 | umode_t mode; |
| 97 | unsigned long seq; | 97 | unsigned long seq; |
| 98 | void *security; | 98 | void *security; |
| 99 | }; | 99 | }; |
