diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-05-06 11:48:50 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-05-06 11:48:50 +0100 |
| commit | 3086c9f6482101b3c06935cdfb4d4b56adb60097 (patch) | |
| tree | 30b40b82f5f6d26982886a2aea5585cfdb4ac9ef /include | |
| parent | c1be5a5b1b355d40e6cf79cc979eb66dafa24ad1 (diff) | |
| parent | 0d2d0cc5216db678070efc911ef47f4cb53b4aad (diff) | |
| download | linux-stable-3086c9f6482101b3c06935cdfb4d4b56adb60097.tar.gz linux-stable-3086c9f6482101b3c06935cdfb4d4b56adb60097.tar.bz2 linux-stable-3086c9f6482101b3c06935cdfb4d4b56adb60097.zip | |
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; * @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 @@ -261,7 +261,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 |