lkml.org 
[lkml]   [2015]   [Nov]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
Subjectlinux-next: manual merge of the spi tree with the net-next tree
Hi Mark,

Today's linux-next merge of the spi tree got a conflict in:

drivers/nfc/trf7970a.c

between commit:

3c39c1a54a26 ("NFC: trf7970a: Add OF match table")

from the net-next tree and commit:

3821a065f567 ("spi: Drop owner assignment from spi_drivers")

from the spi 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/nfc/trf7970a.c
index 123aa981c9d8,4036788c78b6..000000000000
--- a/drivers/nfc/trf7970a.c
+++ b/drivers/nfc/trf7970a.c
@@@ -2229,8 -2223,6 +2229,7 @@@ static struct spi_driver trf7970a_spi_d
.id_table = trf7970a_id_table,
.driver = {
.name = "trf7970a",
+ .of_match_table = of_match_ptr(trf7970a_of_match),
- .owner = THIS_MODULE,
.pm = &trf7970a_pm_ops,
},
};


\
 
 \ /
  Last update: 2015-11-01 13:41    [W:2.993 / U:0.008 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site