diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-05-13 18:27:18 +0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-05-13 18:27:18 +0400 |
| commit | 88b0357dde1c2721a64268e4601d1c2dec1158b0 (patch) | |
| tree | a86c0af317bbb3f501c4d5b3517b02640a9f69c0 /include | |
| parent | 0faa3146f17295f612abadafbfe3d4346178f10f (diff) | |
| parent | 3086c9f6482101b3c06935cdfb4d4b56adb60097 (diff) | |
| download | linux-88b0357dde1c2721a64268e4601d1c2dec1158b0.tar.xz | |
Merge remote-tracking branch 'spi/fix/grant' into spi-linus
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 733eb5ee31c5..6ff26c8db7b9 100644 --- a/include/linux/spi/spi.h +++ b/include/linux/spi/spi.h @@ -57,7 +57,7 @@ extern struct bus_type spi_bus_type; * @modalias: Name of the driver to use with this device, or an alias * for that name. This appears in the sysfs "modalias" attribute * for driver coldplugging, and in uevents used for hotplugging - * @cs_gpio: gpio number of the chipselect line (optional, -EINVAL when + * @cs_gpio: gpio number of the chipselect line (optional, -ENOENT when * when not using a GPIO line) * * A @spi_device is used to interchange data between an SPI slave @@ -266,7 +266,7 @@ static inline void spi_unregister_driver(struct spi_driver *sdrv) * queue so the subsystem notifies the driver that it may relax the * hardware by issuing this call * @cs_gpios: Array of GPIOs to use as chip select lines; one per CS - * number. Any individual value may be -EINVAL for CS lines that + * number. Any individual value may be -ENOENT for CS lines that * are not GPIOs (driven by the SPI controller itself). * * Each SPI master controller can communicate with one or more @spi_device |