Messages in this thread | | | Date | Mon, 17 Jun 2013 14:21:20 +1000 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the fbdev tree with the drm tree |
| |
Hi all,
Today's linux-next merge of the fbdev tree got a conflict in drivers/video/of_display_timing.c between commit f583662347c6 ("video: display_timing: make parameter const") from the drm tree and commits fcf7e6e5bd84 ("videomode: don't allocate mem in of_get_display_timing()") and ffa3fd21de8a ("videomode: implement public of_get_display_timing()") from the fbdev tree.
I fixed it up (see below) and can carry the fix as necessary (no action is required).
-- Cheers, Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/video/of_display_timing.c index 2894e03,9c0f17b..0000000 --- a/drivers/video/of_display_timing.c +++ b/drivers/video/of_display_timing.c @@@ -53,13 -53,12 +53,12 @@@ static int parse_timing_property(const } /** - * of_get_display_timing - parse display_timing entry from device_node + * of_parse_display_timing - parse display_timing entry from device_node * @np: device_node with the properties **/ - static struct display_timing *of_get_display_timing(const struct device_node - *np) -static int of_parse_display_timing(struct device_node *np, ++static int of_parse_display_timing(const struct device_node *np, + struct display_timing *dt) { - struct display_timing *dt; u32 val = 0; int ret = 0; [unhandled content-type:application/pgp-signature] | |