diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-06-20 20:46:21 -0400 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-06-20 20:46:21 -0400 |
| commit | 70ac4385a13f78bc478f26d317511893741b05bd (patch) | |
| tree | dafc7f3018295fc4ee00339889e4f35d5b9d7743 /include/linux/msg.h | |
| parent | d59bf96cdde5b874a57bfd1425faa45da915d0b7 (diff) | |
| parent | 077e98945db7e54a9865b5f29a1f02f531eca414 (diff) | |
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/
Conflicts:
include/linux/nfs_fs.h
Fixed up conflict with kernel header updates.
Diffstat (limited to 'include/linux/msg.h')
| -rw-r--r-- | include/linux/msg.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/msg.h b/include/linux/msg.h index 903e0ab8101f..acc7c174ff00 100644 --- a/include/linux/msg.h +++ b/include/linux/msg.h | |||
| @@ -2,7 +2,6 @@ | |||
| 2 | #define _LINUX_MSG_H | 2 | #define _LINUX_MSG_H |
| 3 | 3 | ||
| 4 | #include <linux/ipc.h> | 4 | #include <linux/ipc.h> |
| 5 | #include <linux/list.h> | ||
| 6 | 5 | ||
| 7 | /* ipcs ctl commands */ | 6 | /* ipcs ctl commands */ |
| 8 | #define MSG_STAT 11 | 7 | #define MSG_STAT 11 |
| @@ -63,6 +62,7 @@ struct msginfo { | |||
| 63 | #define MSGSEG (__MSGSEG <= 0xffff ? __MSGSEG : 0xffff) | 62 | #define MSGSEG (__MSGSEG <= 0xffff ? __MSGSEG : 0xffff) |
| 64 | 63 | ||
| 65 | #ifdef __KERNEL__ | 64 | #ifdef __KERNEL__ |
| 65 | #include <linux/list.h> | ||
| 66 | 66 | ||
| 67 | /* one msg_msg structure for each message */ | 67 | /* one msg_msg structure for each message */ |
| 68 | struct msg_msg { | 68 | struct msg_msg { |