diff options
Diffstat (limited to 'arch/powerpc/kernel/Makefile')
-rw-r--r-- | arch/powerpc/kernel/Makefile | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/arch/powerpc/kernel/Makefile b/arch/powerpc/kernel/Makefile index aab0ae33a42a..bf3fd6f02249 100644 --- a/arch/powerpc/kernel/Makefile +++ b/arch/powerpc/kernel/Makefile | |||
@@ -33,10 +33,6 @@ obj-$(CONFIG_LPARCFG) += lparcfg.o | |||
33 | obj-$(CONFIG_IBMVIO) += vio.o | 33 | obj-$(CONFIG_IBMVIO) += vio.o |
34 | obj-$(CONFIG_IBMEBUS) += ibmebus.o | 34 | obj-$(CONFIG_IBMEBUS) += ibmebus.o |
35 | obj-$(CONFIG_GENERIC_TBSYNC) += smp-tbsync.o | 35 | obj-$(CONFIG_GENERIC_TBSYNC) += smp-tbsync.o |
36 | obj-$(CONFIG_PPC_PSERIES) += udbg_16550.o | ||
37 | obj-$(CONFIG_PPC_MAPLE) += udbg_16550.o | ||
38 | udbgscc-$(CONFIG_PPC64) := udbg_scc.o | ||
39 | obj-$(CONFIG_PPC_PMAC) += $(udbgscc-y) | ||
40 | obj64-$(CONFIG_PPC_MULTIPLATFORM) += nvram_64.o | 36 | obj64-$(CONFIG_PPC_MULTIPLATFORM) += nvram_64.o |
41 | 37 | ||
42 | ifeq ($(CONFIG_PPC_MERGE),y) | 38 | ifeq ($(CONFIG_PPC_MERGE),y) |
@@ -59,14 +55,15 @@ obj-$(CONFIG_BOOTX_TEXT) += btext.o | |||
59 | obj-$(CONFIG_6xx) += idle_6xx.o | 55 | obj-$(CONFIG_6xx) += idle_6xx.o |
60 | obj-$(CONFIG_SMP) += smp.o | 56 | obj-$(CONFIG_SMP) += smp.o |
61 | obj-$(CONFIG_KPROBES) += kprobes.o | 57 | obj-$(CONFIG_KPROBES) += kprobes.o |
62 | 58 | obj-$(CONFIG_PPC_MULTIPLATFORM) += legacy_serial.o | |
59 | obj64-$(CONFIG_PPC_MULTIPLATFORM) += udbg_16550.o | ||
60 | obj64-$(CONFIG_PPC_PMAC) += udbg_scc.o | ||
63 | module-$(CONFIG_PPC64) += module_64.o | 61 | module-$(CONFIG_PPC64) += module_64.o |
64 | obj-$(CONFIG_MODULES) += $(module-y) | 62 | obj-$(CONFIG_MODULES) += $(module-y) |
65 | 63 | ||
66 | pci64-$(CONFIG_PPC64) += pci_64.o pci_dn.o pci_iommu.o \ | 64 | pci64-$(CONFIG_PPC64) += pci_64.o pci_dn.o pci_iommu.o \ |
67 | pci_direct_iommu.o iomap.o | 65 | pci_direct_iommu.o iomap.o |
68 | obj-$(CONFIG_PCI) += $(pci64-y) | 66 | obj-$(CONFIG_PCI) += $(pci64-y) |
69 | |||
70 | kexec-$(CONFIG_PPC64) := machine_kexec_64.o | 67 | kexec-$(CONFIG_PPC64) := machine_kexec_64.o |
71 | kexec-$(CONFIG_PPC32) := machine_kexec_32.o | 68 | kexec-$(CONFIG_PPC32) := machine_kexec_32.o |
72 | obj-$(CONFIG_KEXEC) += machine_kexec.o $(kexec-y) | 69 | obj-$(CONFIG_KEXEC) += machine_kexec.o $(kexec-y) |