Messages in this thread | | | Date | Wed, 14 Aug 2013 13:53:30 +0200 | Subject | Re: linux-next: manual merge of the tip tree with the omap_dss2 tree | From | David Herrmann <> |
| |
Hi
On Wed, Aug 14, 2013 at 6:31 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote: > Hi all, > > Today's linux-next merge of the tip tree got a conflict in > drivers/video/simplefb.c between commit dbb5ff4c2300 ("simplefb: add > support for a8b8g8r8 pixel format") from the omap_dss2 tree and commit > 5ef76da644bf ("fbdev: simplefb: add init through platform_data") from the > tip tree. > > I fixed it up (I think - see below, please check - I used the latter > version of the above file) and can carry the fix as necessary (no action > is required).
Looks good. Thanks! David
> -- > Cheers, > Stephen Rothwell sfr@canb.auug.org.au > > diff --git a/include/linux/platform_data/simplefb.h b/include/linux/platform_data/simplefb.h > index 53774b0..c395d4c 100644 > --- a/include/linux/platform_data/simplefb.h > +++ b/include/linux/platform_data/simplefb.h > @@ -27,6 +27,7 @@ > { "a8r8g8b8", 32, {16, 8}, {8, 8}, {0, 8}, {24, 8}, DRM_FORMAT_ARGB8888 }, \ > { "x2r10g10b10", 32, {20, 10}, {10, 10}, {0, 10}, {0, 0}, DRM_FORMAT_XRGB2101010 }, \ > { "a2r10g10b10", 32, {20, 10}, {10, 10}, {0, 10}, {30, 2}, DRM_FORMAT_ARGB2101010 }, \ > + { "a8b8g8r8", 32, {0, 8}, {8, 8}, {16, 8}, {24, 8}, DRM_FORMAT_ABGR8888 }, \ > } > > /*
| |