Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus

[linux-2.6-omap-h63xx.git] / include / asm-powerpc / ipcbuf.h

diff --git a/include/asm-powerpc/ipcbuf.h b/include/asm-powerpc/ipcbuf.h
index 71382c1ec6e3fb6d200c3b06985a2ed65a64c63a..2c3e1d94db1d04e2051570ad54f4c3122e335377 100644 (file)
--- a/include/asm-powerpc/ipcbuf.h
+++ b/include/asm-powerpc/ipcbuf.h
@@ -27,7 +27,8 @@ struct ipc64_perm
        __kernel_mode_t mode;
        unsigned int    seq;
        unsigned int    __pad1;
-       __u32           __unused[4];
+       unsigned long long __unused1;
+       unsigned long long __unused2;
 };
 
 #endif /* _ASM_POWERPC_IPCBUF_H */