]> err.no Git - linux-2.6/commit
powerpc: Merge remaining RTAS code
authorPaul Mackerras <paulus@samba.org>
Thu, 3 Nov 2005 03:41:19 +0000 (14:41 +1100)
committerPaul Mackerras <paulus@samba.org>
Thu, 3 Nov 2005 03:41:19 +0000 (14:41 +1100)
commitf4fcbbe9a7fdf11305fea657202b954bdc2228ec
treed3f6a54b82b6d28f7e78cebd8043df2d9b596b5a
parent398382999bcff46ec1c7e7ab7574b10b087481c7
powerpc: Merge remaining RTAS code

This moves rtas-proc.c and rtas_flash.c into arch/powerpc/kernel, since
cell wants them as well as pseries (and chrp can use rtas-proc.c too,
at least in principle).  rtas_fw.c is gone, with its bits moved into
rtas_flash.c and rtas.c.

Signed-off-by: Paul Mackerras <paulus@samba.org>
12 files changed:
arch/powerpc/Kconfig
arch/powerpc/kernel/Makefile
arch/powerpc/kernel/rtas-proc.c [moved from arch/ppc64/kernel/rtas-proc.c with 100% similarity]
arch/powerpc/kernel/rtas.c
arch/powerpc/kernel/rtas_flash.c [moved from arch/ppc64/kernel/rtas_flash.c with 83% similarity]
arch/powerpc/kernel/rtas_fw.c [deleted file]
arch/powerpc/platforms/pseries/Kconfig
arch/powerpc/platforms/pseries/Makefile
arch/powerpc/platforms/pseries/rtasd.c [moved from arch/ppc64/kernel/rtasd.c with 100% similarity]
arch/powerpc/platforms/pseries/setup.c
arch/ppc64/kernel/Makefile
include/asm-powerpc/rtas.h