Messages in this thread | | | Date | Tue, 13 Nov 2012 08:21:26 +0100 | Subject | Re: linux-next: manual merge of the arm-soc tree with the net-next tree | From | Joachim Eastwood <> |
| |
On 13 November 2012 05:15, Stephen Rothwell <sfr@canb.auug.org.au> wrote: > Hi all, > > Today's linux-next merge of the arm-soc tree got a conflict in > drivers/net/ethernet/cadence/at91_ether.c between various commits from > the net-next tree and commit bcd2360c1ff9 ("arm: at91: move platfarm_data > to include/linux/platform_data/atmel.h") from the arm-soc tree. > > I fixed it up (I think - see below) and can carry the fix as necessary > (no action is required). > > -- > Cheers, > Stephen Rothwell sfr@canb.auug.org.au > > diff --cc drivers/net/ethernet/cadence/at91_ether.c > index e7a476c,35fc6edb..0000000 > --- a/drivers/net/ethernet/cadence/at91_ether.c > +++ b/drivers/net/ethernet/cadence/at91_ether.c > @@@ -25,53 -31,728 +25,54 @@@ > #include <linux/clk.h> > #include <linux/gfp.h> > #include <linux/phy.h> > +#include <linux/io.h> > +#include <linux/of.h> > +#include <linux/of_device.h> > +#include <linux/of_net.h> > +#include <linux/pinctrl/consumer.h> > + #include <linux/platform_data/atmel.h>
The platform_data/atmel.h include shouldn't be necessary since the driver already includes platform_data/macb.h.
Otherwise the fix up looks correct.
regards Joachim Eastwood
| |