]> err.no Git - linux-2.6/commit
[PATCH] powerpc: Merge a few more include files
authorjdl@freescale.com <jdl@freescale.com>
Wed, 7 Sep 2005 20:59:48 +0000 (15:59 -0500)
committerPaul Mackerras <paulus@samba.org>
Fri, 9 Sep 2005 12:11:35 +0000 (22:11 +1000)
commitdd56fdf23dfa0127d512b73d4238dbd2b5a7c1eb
tree59f952b87d4bec5f11c578a384c3aaa2ddf5860d
parent64807081e38703617cf9a5d71db14ea2b3e1cb04
[PATCH] powerpc: Merge a few more include files

Merge a few asm-ppc and asm-ppc64 header files.
Note: the merge of setup.h intentionally does not carry
forward the m68k cruft.  That means this patch continues
to break the already broken amiga on the ppc32.

Signed-off-by: Jon Loeliger <jdl@freescale.com>
Signed-off-by: Kumar Gala <kumar.gala@freescale.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
13 files changed:
include/asm-powerpc/msgbuf.h [moved from include/asm-ppc/msgbuf.h with 64% similarity]
include/asm-powerpc/param.h [moved from include/asm-ppc/param.h with 70% similarity]
include/asm-powerpc/setup.h [new file with mode: 0644]
include/asm-powerpc/timex.h [moved from include/asm-ppc/timex.h with 53% similarity]
include/asm-powerpc/topology.h [moved from include/asm-ppc64/topology.h with 92% similarity]
include/asm-powerpc/user.h [moved from include/asm-ppc/user.h with 92% similarity]
include/asm-ppc/setup.h [deleted file]
include/asm-ppc/topology.h [deleted file]
include/asm-ppc64/msgbuf.h [deleted file]
include/asm-ppc64/param.h [deleted file]
include/asm-ppc64/setup.h [deleted file]
include/asm-ppc64/timex.h [deleted file]
include/asm-ppc64/user.h [deleted file]