Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6

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

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