diff options
| author | Steve French <sfrench@us.ibm.com> | 2006-01-12 17:47:08 -0500 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2006-01-12 17:47:08 -0500 |
| commit | 94bc2be31a01a3055ec94176e595dfe208e92d3b (patch) | |
| tree | ebfbe81c6718a6390bfa1b99c6d228237d818576 /ipc/msg.c | |
| parent | c32a0b689cb9cc160cfcd19735bbf50bb70c6ef4 (diff) | |
| parent | 58cba4650a7a414eabd2b40cc9d8e45fcdf192d9 (diff) | |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Signed-off-by: Steve French <sfrench@us.ibm.com>
Diffstat (limited to 'ipc/msg.c')
| -rw-r--r-- | ipc/msg.c | 1 |
1 files changed, 1 insertions, 0 deletions
| @@ -15,6 +15,7 @@ | |||
| 15 | * (c) 1999 Manfred Spraul <manfreds@colorfullife.com> | 15 | * (c) 1999 Manfred Spraul <manfreds@colorfullife.com> |
| 16 | */ | 16 | */ |
| 17 | 17 | ||
| 18 | #include <linux/capability.h> | ||
| 18 | #include <linux/config.h> | 19 | #include <linux/config.h> |
| 19 | #include <linux/slab.h> | 20 | #include <linux/slab.h> |
| 20 | #include <linux/msg.h> | 21 | #include <linux/msg.h> |