From: Paul Mackerras <paulus@samba.org>
Date: Sat, 19 Nov 2005 09:17:32 +0000 (+1100)
Subject: powerpc: Trivially merge several headers from asm-ppc64 to asm-powerpc
X-Git-Tag: v2.6.15-rc2~9
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=047ea7846565917c4a666635fa1fa4b5c587cd55;p=pandora-kernel.git

powerpc: Trivially merge several headers from asm-ppc64 to asm-powerpc

For these, I have just done the lame-o merge where the file ends up
looking like:

	#ifndef CONFIG_PPC64
	#include <asm-ppc/foo.h>
	#else
	... contents from asm-ppc64/foo.h
	#endif

so nothing has changed, really, except that we reduce include/asm-ppc64
a bit more.

Signed-off-by: Paul Mackerras <paulus@samba.org>
---

Reading git-diff-tree failed