diff options
| author | Mark Brown <broonie@linaro.org> | 2013-09-16 19:59:54 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-09-16 19:59:54 -0400 |
| commit | fbce71cae72f9f8fd1f2d00e0d47d6cc5f74e2e1 (patch) | |
| tree | a883297030b85f1fca55bd6b3c787d9f0753c999 /include/linux/spi/spi.h | |
| parent | 50c959fc3366693174cdf3f1c82d0c01bbee926f (diff) | |
| parent | 666d5b4c742ba666eb68b467d777b7862f362ae5 (diff) | |
Merge remote-tracking branch 'spi/topic/devm' into spi-s3c64xx
Diffstat (limited to 'include/linux/spi/spi.h')
| -rw-r--r-- | include/linux/spi/spi.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/spi/spi.h b/include/linux/spi/spi.h index 887116dbce2c..4d634d66ba0b 100644 --- a/include/linux/spi/spi.h +++ b/include/linux/spi/spi.h | |||
| @@ -434,6 +434,8 @@ extern struct spi_master * | |||
| 434 | spi_alloc_master(struct device *host, unsigned size); | 434 | spi_alloc_master(struct device *host, unsigned size); |
| 435 | 435 | ||
| 436 | extern int spi_register_master(struct spi_master *master); | 436 | extern int spi_register_master(struct spi_master *master); |
| 437 | extern int devm_spi_register_master(struct device *dev, | ||
| 438 | struct spi_master *master); | ||
| 437 | extern void spi_unregister_master(struct spi_master *master); | 439 | extern void spi_unregister_master(struct spi_master *master); |
| 438 | 440 | ||
| 439 | extern struct spi_master *spi_busnum_to_master(u16 busnum); | 441 | extern struct spi_master *spi_busnum_to_master(u16 busnum); |