diff options
author | Paul Mackerras <paulus@samba.org> | 2005-10-26 03:05:24 -0400 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2005-10-26 03:05:24 -0400 |
commit | 033ef338b6e007dc081c6282a4f2a9dd761f8cd2 (patch) | |
tree | 3c77fad71c3d9ba04ddcdaea33063aaf7520ddb0 /arch/powerpc/kernel/Makefile | |
parent | f9bd170a87948a9e077149b70fb192c563770fdf (diff) |
powerpc: Merge rtas.c into arch/powerpc/kernel
This splits arch/ppc64/kernel/rtas.c into arch/powerpc/kernel/rtas.c,
which contains generic RTAS functions useful on any CHRP platform,
and arch/powerpc/platforms/pseries/rtas-fw.[ch], which contain
some pSeries-specific firmware flashing bits. The parts of rtas.c
that are to do with pSeries-specific error logging are protected
by a new CONFIG_RTAS_ERROR_LOGGING symbol. The inclusion of rtas.o
is controlled by the CONFIG_PPC_RTAS symbol, and the relevant
platforms select that.
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/powerpc/kernel/Makefile')
-rw-r--r-- | arch/powerpc/kernel/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/powerpc/kernel/Makefile b/arch/powerpc/kernel/Makefile index f5d8038fed52..eaedb7e63315 100644 --- a/arch/powerpc/kernel/Makefile +++ b/arch/powerpc/kernel/Makefile | |||
@@ -16,6 +16,7 @@ obj-$(CONFIG_PPC64) += binfmt_elf32.o sys_ppc32.o ptrace32.o | |||
16 | obj-$(CONFIG_ALTIVEC) += vecemu.o vector.o | 16 | obj-$(CONFIG_ALTIVEC) += vecemu.o vector.o |
17 | obj-$(CONFIG_POWER4) += idle_power4.o | 17 | obj-$(CONFIG_POWER4) += idle_power4.o |
18 | obj-$(CONFIG_PPC_OF) += of_device.o | 18 | obj-$(CONFIG_PPC_OF) += of_device.o |
19 | obj-$(CONFIG_PPC_RTAS) += rtas.o | ||
19 | obj-$(CONFIG_IBMVIO) += vio.o | 20 | obj-$(CONFIG_IBMVIO) += vio.o |
20 | 21 | ||
21 | ifeq ($(CONFIG_PPC_MERGE),y) | 22 | ifeq ($(CONFIG_PPC_MERGE),y) |