From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 5 Nov 2015 02:40:03 +0000 (+1100)
Subject: Merge remote-tracking branch 'spi/for-next'
X-Git-Tag: KARO-TXUL-2015-12-04~68
X-Git-Url: https://git.kernelconcepts.de/?p=karo-tx-linux.git;a=commitdiff_plain;h=445c9a9ed069c1a4f4142d66a1c46df7ef8911f0

Merge remote-tracking branch 'spi/for-next'
---

445c9a9ed069c1a4f4142d66a1c46df7ef8911f0
diff --cc drivers/input/touchscreen/tsc2005.c
index 1bbe64c89a10,f41f23318484..b9f593dfd2ef
--- a/drivers/input/touchscreen/tsc2005.c
+++ b/drivers/input/touchscreen/tsc2005.c
@@@ -75,8 -750,9 +75,7 @@@ static int tsc2005_remove(struct spi_de
  static struct spi_driver tsc2005_driver = {
  	.driver	= {
  		.name	= "tsc2005",
- 		.owner	= THIS_MODULE,
 -		.pm	= &tsc2005_pm_ops,
 +		.pm	= &tsc200x_pm_ops,
  	},
  	.probe	= tsc2005_probe,
  	.remove	= tsc2005_remove,
diff --cc drivers/net/ieee802154/mrf24j40.c
index aca0fb3cccbf,e4c37d48add1..4cdf51638972
--- a/drivers/net/ieee802154/mrf24j40.c
+++ b/drivers/net/ieee802154/mrf24j40.c
@@@ -1380,9 -811,7 +1380,8 @@@ MODULE_DEVICE_TABLE(spi, mrf24j40_ids)
  
  static struct spi_driver mrf24j40_driver = {
  	.driver = {
 +		.of_match_table = of_match_ptr(mrf24j40_of_match),
  		.name = "mrf24j40",
- 		.owner = THIS_MODULE,
  	},
  	.id_table = mrf24j40_ids,
  	.probe = mrf24j40_probe,
diff --cc drivers/nfc/trf7970a.c
index 123aa981c9d8,4036788c78b6..f857feb2b573
--- 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,
  	},
  };