Re: linux-next: manual merge of the v4l-dvb tree with Linus' tree

From: Stephen Rothwell
Date: Tue Apr 21 2015 - 04:03:08 EST


Hi Laurent,

On Tue, 21 Apr 2015 10:49:52 +0300 Laurent Pinchart <laurent.pinchart@xxxxxxxxxxxxxxxx> wrote:
>
> > +#define MEDIA_BUS_FMT_YUV10_1X30 0x2016
> > +#define MEDIA_BUS_FMT_AYUV8_1X32 0x2017
> > +#define MEDIA_BUS_FMT_UYVY12_2X12 0x201c
> > +#define MEDIA_BUS_FMT_VYUY12_2X12 0x201d
> > +#define MEDIA_BUS_FMT_YUYV12_2X12 0x201e
> > +#define MEDIA_BUS_FMT_YVYU12_2X12 0x201f
>
> The above 6 lines introduce duplicate defines, you can remove them.

OK, thanks, done for tomorrow. Though hopefully all this will be
resolved soon.

--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx

Attachment: pgpaPPY2hE_cP.pgp
Description: OpenPGP digital signature