diff options
| author |   Paul Mackerras <paulus@samba.org> | 2005-10-26 17:05:24 +1000 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-10-26 17:05:24 +1000 |
| commit | 033ef338b6e007dc081c6282a4f2a9dd761f8cd2 (patch) | |
| tree | 3c77fad71c3d9ba04ddcdaea33063aaf7520ddb0 /arch/ppc64/kernel/Makefile | |
| parent | powerpc: Merge i8259.c into arch/powerpc/sysdev (diff) | |
| download | linux-dev-033ef338b6e007dc081c6282a4f2a9dd761f8cd2.tar.xz linux-dev-033ef338b6e007dc081c6282a4f2a9dd761f8cd2.zip | |
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 '')
| -rw-r--r-- | arch/ppc64/kernel/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ppc64/kernel/Makefile b/arch/ppc64/kernel/Makefile index 2c541c6652b2..83ecefdcfef7 100644 --- a/arch/ppc64/kernel/Makefile +++ b/arch/ppc64/kernel/Makefile @@ -43,7 +43,7 @@ obj-$(CONFIG_MODULES) += module.o ifneq ($(CONFIG_PPC_MERGE),y) obj-$(CONFIG_MODULES) += ppc_ksyms.o endif -obj-$(CONFIG_PPC_RTAS) += rtas.o rtas_pci.o +obj-$(CONFIG_PPC_RTAS) += rtas_pci.o obj-$(CONFIG_RTAS_PROC) += rtas-proc.o obj-$(CONFIG_SCANLOG) += scanlog.o obj-$(CONFIG_LPARCFG) += lparcfg.o |