]> err.no Git - linux-2.6/commit
[PATCH] powerpc: Merge ipcbuf.h
authorDavid Gibson <david@gibson.dropbear.id.au>
Tue, 1 Nov 2005 05:53:24 +0000 (16:53 +1100)
committerPaul Mackerras <paulus@samba.org>
Tue, 1 Nov 2005 10:03:26 +0000 (21:03 +1100)
commit031ef0a72aa8f7ee63ae9f307c1bcff92b3ccc2c
treed534555dd06c3f47578bfd70dc9714c693a13138
parent811d4176f4366ca13a00c1fbb57587d210d38f19
[PATCH] powerpc: Merge ipcbuf.h

This patch merges ppc32 and ppc64 versions of ipcbuf.h.  The merge is
essentially trivial, since the structure defined in each version was
already identical.  Only wrinkle is that the merged version now
includes linux/types.h in order to get the fixed width integer types.
In fact, the old versions probably should have been including that
anyway, since the file uses various __kernel_*_t types.

Built and booted on G5, built for 32-bit pmac, but not booted, since
the merge tree currently doesn't boot there.

Signed-off-by: David Gibson <dwg@au1.ibm.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
include/asm-powerpc/ipcbuf.h [new file with mode: 0644]
include/asm-ppc/ipcbuf.h [deleted file]
include/asm-ppc64/ipcbuf.h [deleted file]