Messages in this thread Patch in this message | | | Date | Wed, 14 Aug 2013 14:31:52 +1000 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the tip tree with the omap_dss2 tree |
| |
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).
-- 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 }, \ } /*[unhandled content-type:application/pgp-signature] | |