diff options
author | Mark Brown <broonie@kernel.org> | 2019-04-05 05:19:10 +0200 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2019-04-05 05:19:10 +0200 |
commit | e1a7d1673062a6a9160b1fc94e1540b747398e01 (patch) | |
tree | 77ed1ca15537d1ae04a6ab0ff6128567c0fa497e /drivers/spi/spi-gpio.c | |
parent | spi: sh-msiof: Convert to use GPIO descriptors (diff) | |
parent | spi: tegra114: avoid reset call in atomic context (diff) | |
download | linux-e1a7d1673062a6a9160b1fc94e1540b747398e01.tar.xz linux-e1a7d1673062a6a9160b1fc94e1540b747398e01.zip |
Merge branch 'spi-5.1' into spi-5.2
Diffstat (limited to 'drivers/spi/spi-gpio.c')
-rw-r--r-- | drivers/spi/spi-gpio.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/spi/spi-gpio.c b/drivers/spi/spi-gpio.c index 1cff30adc836..c8fe87ebf8c8 100644 --- a/drivers/spi/spi-gpio.c +++ b/drivers/spi/spi-gpio.c @@ -35,7 +35,6 @@ * platform_device->driver_data ... points to spi_gpio * * spi->controller_state ... reserved for bitbang framework code - * spi->controller_data ... holds chipselect GPIO * * spi->master->dev.driver_data ... points to spi_gpio->bitbang */ |