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-xilinx.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-xilinx.c')
| -rw-r--r-- | drivers/spi/spi-xilinx.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/spi/spi-xilinx.c b/drivers/spi/spi-xilinx.c index 4d8efb16573d..79bd84f43430 100644 --- a/drivers/spi/spi-xilinx.c +++ b/drivers/spi/spi-xilinx.c | |||
| @@ -471,7 +471,6 @@ static struct platform_driver xilinx_spi_driver = { | |||
| 471 | .remove = xilinx_spi_remove, | 471 | .remove = xilinx_spi_remove, |
| 472 | .driver = { | 472 | .driver = { |
| 473 | .name = XILINX_SPI_NAME, | 473 | .name = XILINX_SPI_NAME, |
| 474 | .owner = THIS_MODULE, | ||
| 475 | .of_match_table = xilinx_spi_of_match, | 474 | .of_match_table = xilinx_spi_of_match, |
| 476 | }, | 475 | }, |
| 477 | }; | 476 | }; |