Merge branch 'for-rmk' of git://git.android.com/kernel into devel

1 files changed, 0 insertions, 37 deletions

diff --git a/include/asm-parisc/msgbuf.h b/include/asm-parisc/msgbuf.h
deleted file mode 100644
index fe88f2649418..000000000000
--- a/include/asm-parisc/msgbuf.h
+++ /dev/null
@@ -1,37 +0,0 @@
-#ifndef _PARISC_MSGBUF_H
-#define _PARISC_MSGBUF_H
-
-/* 
- * The msqid64_ds structure for parisc architecture, copied from sparc.
- * Note extra padding because this structure is passed back and forth
- * between kernel and user space.
- *
- * Pad space is left for:
- * - 64-bit time_t to solve y2038 problem
- * - 2 miscellaneous 32-bit values
- */
-
-struct msqid64_ds {
-        struct ipc64_perm msg_perm;
-#ifndef CONFIG_64BIT
-        unsigned int   __pad1;
-#endif
-        __kernel_time_t msg_stime;      /* last msgsnd time */
-#ifndef CONFIG_64BIT
-        unsigned int   __pad2;
-#endif
-        __kernel_time_t msg_rtime;      /* last msgrcv time */
-#ifndef CONFIG_64BIT
-        unsigned int   __pad3;
-#endif
-        __kernel_time_t msg_ctime;      /* last change time */
-        unsigned int  msg_cbytes;       /* current number of bytes on queue */
-        unsigned int  msg_qnum; /* number of messages in queue */
-        unsigned int  msg_qbytes;       /* max number of bytes on queue */
-        __kernel_pid_t msg_lspid;       /* pid of last msgsnd */
-        __kernel_pid_t msg_lrpid;       /* last receive pid */
-        unsigned int  __unused1;
-        unsigned int  __unused2;
-};
-
-#endif /* _PARISC_MSGBUF_H */