diff options
| author | Paul Mackerras <paulus@samba.org> | 2005-10-10 08:45:07 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-10-10 08:45:07 -0400 |
| commit | bc6f8a4b199156897f6eb5b70bf5c1a4773f4e2b (patch) | |
| tree | 03ab5936f5924b7773b3ad5c486454bf66ab76af /arch/powerpc | |
| parent | 5a408329ed19cf2a80e831d28cbd93d2e36155a6 (diff) | |
powerpc: move lparmap.c to arch/powerpc/kernel
Since lparmap.s gets included in arch/powerpc/kernel/head_64.S,
this avoids depending on a file in another directory.
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/powerpc')
| -rw-r--r-- | arch/powerpc/kernel/Makefile | 5 | ||||
| -rw-r--r-- | arch/powerpc/kernel/lparmap.c (renamed from arch/powerpc/platforms/iseries/lparmap.c) | 0 |
2 files changed, 3 insertions, 2 deletions
diff --git a/arch/powerpc/kernel/Makefile b/arch/powerpc/kernel/Makefile index 0625470a6235..bc063edd6de0 100644 --- a/arch/powerpc/kernel/Makefile +++ b/arch/powerpc/kernel/Makefile | |||
| @@ -33,6 +33,7 @@ obj-$(CONFIG_ALTIVEC) += vecemu.o vector.o | |||
| 33 | obj-$(CONFIG_BOOTX_TEXT) += btext.o | 33 | obj-$(CONFIG_BOOTX_TEXT) += btext.o |
| 34 | 34 | ||
| 35 | ifeq ($(CONFIG_PPC_ISERIES),y) | 35 | ifeq ($(CONFIG_PPC_ISERIES),y) |
| 36 | arch/powerpc/kernel/head_64.o: arch/powerpc/platforms/iseries/lparmap.s | 36 | $(obj)/head_64.o: $(obj)/lparmap.s |
| 37 | AFLAGS_head_64.o += -Iarch/powerpc/platforms/iseries | 37 | AFLAGS_head_64.o += -I$(obj) |
| 38 | endif | ||
| 38 | endif | 39 | endif |
diff --git a/arch/powerpc/platforms/iseries/lparmap.c b/arch/powerpc/kernel/lparmap.c index b81de286df5e..b81de286df5e 100644 --- a/arch/powerpc/platforms/iseries/lparmap.c +++ b/arch/powerpc/kernel/lparmap.c | |||