diff options
| author | Mark Brown <broonie@kernel.org> | 2014-10-20 12:55:07 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2014-10-20 13:27:32 -0400 |
| commit | b7a40242c82cd73cfcea305f23e67d068dd8401a (patch) | |
| tree | 251b49d19cd7c371847ae1f951e1b537ca0e1c15 /drivers/spi/spi-cadence.c | |
| parent | d26833bfce5e56017bea9f1f50838f20e18e7b7e (diff) | |
| parent | 9c6de47d53a3ce8df1642ae67823688eb98a190a (diff) | |
Merge branch 'fix/dw' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi into spi-dw
Conflicts:
drivers/spi/spi-dw-mid.c
Diffstat (limited to 'drivers/spi/spi-cadence.c')
| -rw-r--r-- | drivers/spi/spi-cadence.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/spi/spi-cadence.c b/drivers/spi/spi-cadence.c index 562ff83debd9..7b811e38c7ad 100644 --- a/drivers/spi/spi-cadence.c +++ b/drivers/spi/spi-cadence.c | |||
| @@ -677,7 +677,6 @@ static struct platform_driver cdns_spi_driver = { | |||
| 677 | .remove = cdns_spi_remove, | 677 | .remove = cdns_spi_remove, |
| 678 | .driver = { | 678 | .driver = { |
| 679 | .name = CDNS_SPI_NAME, | 679 | .name = CDNS_SPI_NAME, |
| 680 | .owner = THIS_MODULE, | ||
| 681 | .of_match_table = cdns_spi_of_match, | 680 | .of_match_table = cdns_spi_of_match, |
| 682 | .pm = &cdns_spi_dev_pm_ops, | 681 | .pm = &cdns_spi_dev_pm_ops, |
| 683 | }, | 682 | }, |