diff options
| author | Paul Mackerras <paulus@samba.org> | 2005-11-03 14:41:19 +1100 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-11-03 14:41:19 +1100 |
| commit | f4fcbbe9a7fdf11305fea657202b954bdc2228ec (patch) | |
| tree | d3f6a54b82b6d28f7e78cebd8043df2d9b596b5a /arch/powerpc/kernel/Makefile | |
| parent | 398382999bcff46ec1c7e7ab7574b10b087481c7 (diff) | |
| download | lwn-f4fcbbe9a7fdf11305fea657202b954bdc2228ec.tar.gz lwn-f4fcbbe9a7fdf11305fea657202b954bdc2228ec.zip | |
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>
Diffstat (limited to 'arch/powerpc/kernel/Makefile')
| -rw-r--r-- | arch/powerpc/kernel/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/Makefile b/arch/powerpc/kernel/Makefile index abad3059a21a..601ddbf1c20b 100644 --- a/arch/powerpc/kernel/Makefile +++ b/arch/powerpc/kernel/Makefile @@ -18,7 +18,8 @@ obj-$(CONFIG_ALTIVEC) += vecemu.o vector.o obj-$(CONFIG_POWER4) += idle_power4.o obj-$(CONFIG_PPC_OF) += of_device.o obj-$(CONFIG_PPC_RTAS) += rtas.o -obj-$(CONFIG_RTAS_FW) += rtas_fw.o +obj-$(CONFIG_RTAS_FLASH) += rtas_flash.o +obj-$(CONFIG_RTAS_PROC) += rtas-proc.o obj-$(CONFIG_IBMVIO) += vio.o ifeq ($(CONFIG_PPC_MERGE),y) |