diff options
| author | Mark Brown <broonie@kernel.org> | 2014-10-03 11:33:44 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2014-10-03 11:33:44 -0400 |
| commit | a2285b8c75bf7e21895f7c2cf75d6a910914517b (patch) | |
| tree | 028d604aab1c42b3c1ccac34cde7e8a02919d6d8 /drivers/spi | |
| parent | bab4d751f70bcecdcaad56dad9785224a5a6f9db (diff) | |
| parent | 9c0b8fd1a5493d0c5ab2fb147e758ca556e80863 (diff) | |
Merge remote-tracking branch 'spi/topic/xilinx' into spi-next
Diffstat (limited to 'drivers/spi')
| -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 | }; |