diff options
author | David Gibson <david@gibson.dropbear.id.au> | 2005-11-09 23:26:20 -0500 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2005-11-09 23:32:37 -0500 |
commit | d3d2176a0bc696b5365ce0e8f82a29a521d85fd0 (patch) | |
tree | 251e7e096f5d96450954df130483f0616452180d /arch/ppc64/kernel/Makefile | |
parent | 0f34f490290e05ee6c02e20b3811fce6f09318f4 (diff) |
[PATCH] powerpc: Move more ppc64 files with no ppc32 equivalent to powerpc
This patch moves a bunch more files from arch/ppc64 and
include/asm-ppc64 which have no equivalents in ppc32 code into
arch/powerpc and include/asm-powerpc. The file affected are:
hvcall.h
proc_ppc64.c
sysfs.c
lparcfg.c
rtas_pci.c
The only changes apart from the move and corresponding Makefile
changes are:
- #ifndef/#define in includes updated to _ASM_POWERPC_ form
- trailing whitespace removed
- comments giving full paths removed
Built and booted on POWER5 LPAR (ARCH=powerpc and ARCH=ppc64), built
for 32-bit powermac (ARCH=powerpc).
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/ppc64/kernel/Makefile')
-rw-r--r-- | arch/ppc64/kernel/Makefile | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/arch/ppc64/kernel/Makefile b/arch/ppc64/kernel/Makefile index 048ba910f028..58b19f107656 100644 --- a/arch/ppc64/kernel/Makefile +++ b/arch/ppc64/kernel/Makefile | |||
@@ -15,7 +15,7 @@ obj-y += idle.o dma.o \ | |||
15 | align.o \ | 15 | align.o \ |
16 | udbg.o \ | 16 | udbg.o \ |
17 | rtc.o \ | 17 | rtc.o \ |
18 | iommu.o sysfs.o vdso.o | 18 | iommu.o vdso.o |
19 | obj-y += vdso32/ vdso64/ | 19 | obj-y += vdso32/ vdso64/ |
20 | 20 | ||
21 | pci-obj-$(CONFIG_PPC_MULTIPLATFORM) += pci_dn.o pci_direct_iommu.o | 21 | pci-obj-$(CONFIG_PPC_MULTIPLATFORM) += pci_dn.o pci_direct_iommu.o |
@@ -30,13 +30,10 @@ endif | |||
30 | obj-$(CONFIG_PPC_PSERIES) += udbg_16550.o | 30 | obj-$(CONFIG_PPC_PSERIES) += udbg_16550.o |
31 | 31 | ||
32 | obj-$(CONFIG_KEXEC) += machine_kexec.o | 32 | obj-$(CONFIG_KEXEC) += machine_kexec.o |
33 | obj-$(CONFIG_PROC_FS) += proc_ppc64.o | ||
34 | obj-$(CONFIG_MODULES) += module.o | 33 | obj-$(CONFIG_MODULES) += module.o |
35 | ifneq ($(CONFIG_PPC_MERGE),y) | 34 | ifneq ($(CONFIG_PPC_MERGE),y) |
36 | obj-$(CONFIG_MODULES) += ppc_ksyms.o | 35 | obj-$(CONFIG_MODULES) += ppc_ksyms.o |
37 | endif | 36 | endif |
38 | obj-$(CONFIG_PPC_RTAS) += rtas_pci.o | ||
39 | obj-$(CONFIG_LPARCFG) += lparcfg.o | ||
40 | obj-$(CONFIG_HVC_CONSOLE) += hvconsole.o | 37 | obj-$(CONFIG_HVC_CONSOLE) += hvconsole.o |
41 | ifneq ($(CONFIG_PPC_MERGE),y) | 38 | ifneq ($(CONFIG_PPC_MERGE),y) |
42 | obj-$(CONFIG_BOOTX_TEXT) += btext.o | 39 | obj-$(CONFIG_BOOTX_TEXT) += btext.o |