diff options
author | Anton Altaparmakov <aia21@cantab.net> | 2005-07-04 14:14:42 +0100 |
---|---|---|
committer | Anton Altaparmakov <aia21@cantab.net> | 2005-07-04 14:14:42 +0100 |
commit | 07929dcb963786512c760dd3ecd148d89295e7e5 (patch) | |
tree | f5db01392ebb968b4c8acb5a6b3b03a833bfcb02 /include/asm-xtensa/ipc.h | |
parent | c2d9b8387bce8b4a0fd402fab7dc1319d11a418d (diff) | |
parent | 19f7241a3b087bbf4dd107c979608fdb56c83a09 (diff) |
Automatic merge with /usr/src/ntfs-2.6.git.
Diffstat (limited to 'include/asm-xtensa/ipc.h')
-rw-r--r-- | include/asm-xtensa/ipc.h | 20 |
1 files changed, 1 insertions, 19 deletions
diff --git a/include/asm-xtensa/ipc.h b/include/asm-xtensa/ipc.h index d37bdb4d4c9..a9eed4e21cb 100644 --- a/include/asm-xtensa/ipc.h +++ b/include/asm-xtensa/ipc.h @@ -11,24 +11,6 @@ #ifndef _XTENSA_IPC_H #define _XTENSA_IPC_H -struct ipc_kludge { - struct msgbuf __user *msgp; - long msgtyp; -}; - -#define SEMOP 1 -#define SEMGET 2 -#define SEMCTL 3 -#define SEMTIMEDOP 4 -#define MSGSND 11 -#define MSGRCV 12 -#define MSGGET 13 -#define MSGCTL 14 -#define SHMAT 21 -#define SHMDT 22 -#define SHMGET 23 -#define SHMCTL 24 - -#define IPCCALL(version,op) ((version)<<16 | (op)) +#include <asm-generic/ipc.h> #endif /* _XTENSA_IPC_H */ |