Messages in this thread | | | Date | Mon, 10 Nov 2014 17:29:21 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the pinctrl tree with the driver-core tree |
| |
Hi Linus,
Today's linux-next merge of the pinctrl tree got a conflict in drivers/pinctrl/pinctrl-rockchip.c between commit 9198f509c888 ("pinctrl: rockchip: add suspend/resume functions") from the driver-core tree and commit 5c759d73b022 ("pinctrl: drop owner assignment from platform_drivers") from the pinctrl 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/pinctrl/pinctrl-rockchip.c index 71d5835d864b,40970c305dd0..000000000000 --- a/drivers/pinctrl/pinctrl-rockchip.c +++ b/drivers/pinctrl/pinctrl-rockchip.c @@@ -1982,6 -2053,8 +2053,7 @@@ static struct platform_driver rockchip_ .probe = rockchip_pinctrl_probe, .driver = { .name = "rockchip-pinctrl", - .owner = THIS_MODULE, + .pm = &rockchip_pinctrl_dev_pm_ops, .of_match_table = rockchip_pinctrl_dt_match, }, }; [unhandled content-type:application/pgp-signature] | |