diff options
author | Mark Brown <broonie@kernel.org> | 2019-04-04 23:19:10 -0400 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2019-04-04 23:19:10 -0400 |
commit | e1a7d1673062a6a9160b1fc94e1540b747398e01 (patch) | |
tree | 77ed1ca15537d1ae04a6ab0ff6128567c0fa497e /drivers/spi/spi-gpio.c | |
parent | 9fda6693335cd51b0a74cffaac266c83439f7efe (diff) | |
parent | a026525d4e45e3d9690bffd0b05d018ff5638b5a (diff) |
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 @@ | |||
35 | * platform_device->driver_data ... points to spi_gpio | 35 | * platform_device->driver_data ... points to spi_gpio |
36 | * | 36 | * |
37 | * spi->controller_state ... reserved for bitbang framework code | 37 | * spi->controller_state ... reserved for bitbang framework code |
38 | * spi->controller_data ... holds chipselect GPIO | ||
39 | * | 38 | * |
40 | * spi->master->dev.driver_data ... points to spi_gpio->bitbang | 39 | * spi->master->dev.driver_data ... points to spi_gpio->bitbang |
41 | */ | 40 | */ |