diff options
| author | Mark Brown <broonie@linaro.org> | 2013-10-09 12:06:34 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-10-09 12:06:34 +0100 |
| commit | 557667f643888e55c92243ff2af961c9fe052ce4 (patch) | |
| tree | f544780da94bf9dd6284b8e6e533f54fe389322d /include | |
| parent | 673d6e1767ee06496f0f94e5087c817003983ffd (diff) | |
| parent | 2fe7e4add3e53df7c1b97e32076f8390dd81c6b3 (diff) | |
Merge remote-tracking branch 'spi/topic/devm' into spi-bfin
Diffstat (limited to 'include')
| -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 * spi_alloc_master(struct device *host, unsigned size); extern int spi_register_master(struct spi_master *master); +extern int devm_spi_register_master(struct device *dev, + struct spi_master *master); extern void spi_unregister_master(struct spi_master *master); extern struct spi_master *spi_busnum_to_master(u16 busnum); |