Messages in this thread | | | Date | Wed, 9 Nov 2011 11:15:02 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the m68knommu tree with the m68k tree |
| |
Hi Greg,
Today's linux-next merge of the m68knommu tree got a conflict in arch/m68k/kernel/Makefile between commits 4936f63cb790 ("m68k/irq: Add genirq support") and d890d7399525 ("m68k/irq: Remove obsolete m68k irq framework") from the m68k tree and commit 7bf6f100a307 ("m68k: merge the init_task code for mmu and non-mmu targets") from the m68knommu tree.
I fixed it up (see below) and can carry the fixes as necessary. -- Cheers, Stephen Rothwell sfr@canb.auug.org.au
diff --cc arch/m68k/kernel/Makefile index c569619,01ae30e..0000000 --- a/arch/m68k/kernel/Makefile +++ b/arch/m68k/kernel/Makefile @@@ -6,15 -6,16 +6,11 @@@ extra-$(CONFIG_MMU) := head. extra-$(CONFIG_SUN3) := sun3-head.o extra-y += vmlinux.lds - obj-y := entry.o irq.o m68k_ksyms.o module.o process.o ptrace.o setup.o \ - signal.o sys_m68k.o syscalltable.o time.o traps.o -obj-y := entry.o init_task.o m68k_ksyms.o module.o process.o ptrace.o ++obj-y := entry.o irq.o init_task.o m68k_ksyms.o module.o process.o ptrace.o + obj-y += setup.o signal.o sys_m68k.o syscalltable.o time.o traps.o -obj-$(CONFIG_MMU) += ints.o devres.o vectors.o -devres-$(CONFIG_MMU) = ../../../kernel/irq/devres.o +obj-$(CONFIG_MMU) += ints.o vectors.o ifndef CONFIG_MMU_SUN3 obj-y += dma.o endif --ifndef CONFIG_MMU - obj-y += init_task.o - endif -obj-y += irq.o -endif - [unhandled content-type:application/pgp-signature] | |