diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-05-06 06:48:50 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-05-06 06:48:50 -0400 |
| commit | 3086c9f6482101b3c06935cdfb4d4b56adb60097 (patch) | |
| tree | 30b40b82f5f6d26982886a2aea5585cfdb4ac9ef /include | |
| parent | c1be5a5b1b355d40e6cf79cc979eb66dafa24ad1 (diff) | |
| parent | 0d2d0cc5216db678070efc911ef47f4cb53b4aad (diff) | |
Merge branch 'spi/merge' of git://git.secretlab.ca/git/linux into spi-fix-grant
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/spi/spi.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/spi/spi.h b/include/linux/spi/spi.h index 38c2b925923d..c395f32b53b3 100644 --- a/include/linux/spi/spi.h +++ b/include/linux/spi/spi.h | |||
| @@ -57,7 +57,7 @@ extern struct bus_type spi_bus_type; | |||
| 57 | * @modalias: Name of the driver to use with this device, or an alias | 57 | * @modalias: Name of the driver to use with this device, or an alias |
| 58 | * for that name. This appears in the sysfs "modalias" attribute | 58 | * for that name. This appears in the sysfs "modalias" attribute |
| 59 | * for driver coldplugging, and in uevents used for hotplugging | 59 | * for driver coldplugging, and in uevents used for hotplugging |
| 60 | * @cs_gpio: gpio number of the chipselect line (optional, -EINVAL when | 60 | * @cs_gpio: gpio number of the chipselect line (optional, -ENOENT when |
| 61 | * when not using a GPIO line) | 61 | * when not using a GPIO line) |
| 62 | * | 62 | * |
| 63 | * A @spi_device is used to interchange data between an SPI slave | 63 | * A @spi_device is used to interchange data between an SPI slave |
| @@ -261,7 +261,7 @@ static inline void spi_unregister_driver(struct spi_driver *sdrv) | |||
| 261 | * queue so the subsystem notifies the driver that it may relax the | 261 | * queue so the subsystem notifies the driver that it may relax the |
| 262 | * hardware by issuing this call | 262 | * hardware by issuing this call |
| 263 | * @cs_gpios: Array of GPIOs to use as chip select lines; one per CS | 263 | * @cs_gpios: Array of GPIOs to use as chip select lines; one per CS |
| 264 | * number. Any individual value may be -EINVAL for CS lines that | 264 | * number. Any individual value may be -ENOENT for CS lines that |
| 265 | * are not GPIOs (driven by the SPI controller itself). | 265 | * are not GPIOs (driven by the SPI controller itself). |
| 266 | * | 266 | * |
| 267 | * Each SPI master controller can communicate with one or more @spi_device | 267 | * Each SPI master controller can communicate with one or more @spi_device |