Messages in this thread | | | Date | Tue, 7 Jun 2011 12:57:23 +1000 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the gpio tree with the slave-dma tree |
| |
Hi Grant,
Today's linux-next merge of the gpio tree got a conflict in arch/arm/mach-ep93xx/Makefile between commit 8e4a93008db7 ("ep93xx: remove the old M2P DMA code") from the slave-dma tree and commit c6b52c13de44 ("gpio/ep93xx: move driver to drivers/gpio") from the gpio tree.
I fixed it up (see below) and can carry the fix as necessary. -- Cheers, Stephen Rothwell sfr@canb.auug.org.au
diff --cc arch/arm/mach-ep93xx/Makefile index 21e721a,6b7c41d..0000000 --- a/arch/arm/mach-ep93xx/Makefile +++ b/arch/arm/mach-ep93xx/Makefile @@@ -1,7 -1,7 +1,7 @@@ # # Makefile for the linux kernel. # - obj-y := core.o clock.o gpio.o -obj-y := core.o clock.o dma-m2p.o ++obj-y := core.o clock.o obj-m := obj-n := obj- :=
| |