Re: linux-next: manual merge of the driver-core tree with the mfd tree

[Greg KH]

On Mon, Nov 10, 2014 at 03:24:26PM +1100, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the driver-core tree got a conflict in
> drivers/mfd/syscon.c between commit d4ad08b424c1 ("mfd: syscon:
> Decouple syscon interface from platform devices") from the mfd tree and
> commit 78a835416ad6 ("mfd: drop owner assignment from
> platform_drivers") from the driver-core tree.
> 
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
> 
> -- 
> Cheers,
> Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx
> 
> diff --cc drivers/mfd/syscon.c
> index 72373b113885,e85c052b302c..000000000000
> --- a/drivers/mfd/syscon.c
> +++ b/drivers/mfd/syscon.c
> @@@ -219,7 -166,7 +219,6 @@@ static const struct platform_device_id 
>   static struct platform_driver syscon_driver = {
>   	.driver = {
>   		.name = "syscon",
> - 		.owner = THIS_MODULE,
>  -		.of_match_table = of_syscon_match,
>   	},
>   	.probe		= syscon_probe,
>   	.id_table	= syscon_ids,


Looks good, thanks.

greg k-h
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/