diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-11 08:16:57 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-11 08:16:57 -0800 |
| commit | 7e4e574c391cdeef516411eb698ac6955f01d673 (patch) | |
| tree | e9f3b05c464b82be608cef1a90688dd3719e1537 /arch/powerpc/kernel/Makefile | |
| parent | a4fc7ab1d065a9dd89ed0e74439ef87d4a16e980 (diff) | |
| parent | 97b1b999748d3cde6a3f381e0839e0f1082323e6 (diff) | |
| download | op-kernel-dev-7e4e574c391cdeef516411eb698ac6955f01d673.zip op-kernel-dev-7e4e574c391cdeef516411eb698ac6955f01d673.tar.gz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-merge
Diffstat (limited to 'arch/powerpc/kernel/Makefile')
| -rw-r--r-- | arch/powerpc/kernel/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/kernel/Makefile b/arch/powerpc/kernel/Makefile index 144e284..bbfa1bd 100644 --- a/arch/powerpc/kernel/Makefile +++ b/arch/powerpc/kernel/Makefile @@ -61,9 +61,9 @@ obj-$(CONFIG_MODULES) += $(module-y) pci64-$(CONFIG_PPC64) += pci_64.o pci_dn.o pci_iommu.o \ pci_direct_iommu.o iomap.o obj-$(CONFIG_PCI) += $(pci64-y) -kexec-$(CONFIG_PPC64) := machine_kexec_64.o +kexec-$(CONFIG_PPC64) := machine_kexec_64.o crash.o kexec-$(CONFIG_PPC32) := machine_kexec_32.o -obj-$(CONFIG_KEXEC) += machine_kexec.o crash.o $(kexec-y) +obj-$(CONFIG_KEXEC) += machine_kexec.o $(kexec-y) ifeq ($(CONFIG_PPC_ISERIES),y) $(obj)/head_64.o: $(obj)/lparmap.s |
