* linux-next: manual merge of the driver-core tree with the l2-mtd tree
@ 2014-11-10 4:28 Stephen Rothwell
2014-11-10 4:39 ` Greg KH
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2014-11-10 4:28 UTC (permalink / raw)
To: Greg KH, Brian Norris
Cc: linux-next, linux-kernel, Wolfram Sang, Robert Jarzmik
[-- Attachment #1: Type: text/plain, Size: 937 bytes --]
Hi Greg,
Today's linux-next merge of the driver-core tree got a conflict in
drivers/mtd/devices/docg3.c between commit a59459f29fb7 ("mtd: docg3:
add device-tree support") from the l2-mtd tree and commit c37c1e160546
("mtd: devices: 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@canb.auug.org.au
diff --cc drivers/mtd/devices/docg3.c
index 0d9d3ee68b61,72346048532d..000000000000
--- a/drivers/mtd/devices/docg3.c
+++ b/drivers/mtd/devices/docg3.c
@@@ -2130,8 -2129,6 +2130,7 @@@ MODULE_DEVICE_TABLE(of, docg3_dt_ids)
static struct platform_driver g3_driver = {
.driver = {
.name = "docg3",
- .owner = THIS_MODULE,
+ .of_match_table = of_match_ptr(docg3_dt_ids),
},
.suspend = docg3_suspend,
.resume = docg3_resume,
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: linux-next: manual merge of the driver-core tree with the l2-mtd tree
2014-11-10 4:28 linux-next: manual merge of the driver-core tree with the l2-mtd tree Stephen Rothwell
@ 2014-11-10 4:39 ` Greg KH
0 siblings, 0 replies; 2+ messages in thread
From: Greg KH @ 2014-11-10 4:39 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Brian Norris, linux-next, linux-kernel, Wolfram Sang, Robert Jarzmik
On Mon, Nov 10, 2014 at 03:28:01PM +1100, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the driver-core tree got a conflict in
> drivers/mtd/devices/docg3.c between commit a59459f29fb7 ("mtd: docg3:
> add device-tree support") from the l2-mtd tree and commit c37c1e160546
> ("mtd: devices: 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@canb.auug.org.au
>
> diff --cc drivers/mtd/devices/docg3.c
> index 0d9d3ee68b61,72346048532d..000000000000
> --- a/drivers/mtd/devices/docg3.c
> +++ b/drivers/mtd/devices/docg3.c
> @@@ -2130,8 -2129,6 +2130,7 @@@ MODULE_DEVICE_TABLE(of, docg3_dt_ids)
> static struct platform_driver g3_driver = {
> .driver = {
> .name = "docg3",
> - .owner = THIS_MODULE,
> + .of_match_table = of_match_ptr(docg3_dt_ids),
> },
> .suspend = docg3_suspend,
> .resume = docg3_resume,
Looks good, thanks.
greg k-h
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-11-10 4:39 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-11-10 4:28 linux-next: manual merge of the driver-core tree with the l2-mtd tree Stephen Rothwell
2014-11-10 4:39 ` Greg KH
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).