On Mon, Jul 26, 2010 at 9:17 PM, Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
> Hi Grant,
>
> Today's linux-next merge of the devicetree tree got a conflict in
> arch/microblaze/kernel/Makefile between commit
> 117aa948321f3b019d9d8160591dc8256a6035cd ("microblaze: Add stack
> unwinder") from the microblaze tree and commit
> c0dd394ca5e78649b7013c3ce2d6338af9f228f0 ("of: remove
> of_default_bus_ids") from the devicetree tree.
>
> Just context changes. I fixed it up (see below) and can carry the fix as
> necessary.
Thanks Stephen. Looks right to me.
g.
> --
> Cheers,
> Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
>
> diff --cc arch/microblaze/kernel/Makefile
> index d66ddef,7fcc5f7..0000000
> --- a/arch/microblaze/kernel/Makefile
> +++ b/arch/microblaze/kernel/Makefile
> @@@ -15,9 -15,9 +15,9 @@@ endi
> extra-y := head.o vmlinux.lds
>
> obj-y += dma.o exceptions.o \
> - hw_exception_handler.o init_task.o intc.o irq.o of_device.o \
> - of_platform.o process.o prom.o prom_parse.o ptrace.o \
> + hw_exception_handler.o init_task.o intc.o irq.o \
> + process.o prom.o prom_parse.o ptrace.o \
> - setup.o signal.o sys_microblaze.o timer.o traps.o reset.o
> + reset.o setup.o signal.o sys_microblaze.o timer.o traps.o unwind.o
>
> obj-y += cpu/
>
>
--
Grant Likely, B.Sc., P.Eng.
Secret Lab Technologies Ltd.
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
