On Sun, Sep 28, 2014 at 05:01:50PM -0400, David Miller wrote:
> From: David Miller <da...@davemloft.net>
> Date: Sun, 28 Sep 2014 16:44:21 -0400 (EDT)
>
> > From: Michael Grzeschik <m.grzesc...@pengutronix.de>
> > Date: Wed, 24 Sep 2014 15:41:48 +0200
> >
> >> this series adds support for the PLX Bridge based multi interface
> >> pci cards and adds support to change device address on com200xx chips
> >> during runtime.
> >>
> >> This series is based on v3.17-rc6.
> >
> > Series applied to net-next, thanks.
>
> I had to revert, this breaks the build:
>
> drivers/net/arcnet/com20020_cs.c:115:8: error: redefinition of ‘struct
> com20020_dev’
> struct com20020_dev {
> ^
> In file included from drivers/net/arcnet/com20020_cs.c:43:0:
> include/linux/com20020.h:66:8: note: originally defined here
> struct com20020_dev {
> ^
> make[3]: *** [drivers/net/arcnet/com20020_cs.o] Error 1
> make[2]: *** [drivers/net/arcnet] Error 2
> make[2]: *** Waiting for unfinished jobs....
> make[1]: *** [drivers/net] Error 2
> make[1]: *** Waiting for unfinished jobs....
> make: *** [drivers] Error 2
Oh, I didn't look into the other com20020 drivers.
I will fix it and send v2.
Thanks,
Michael
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
