diff options
| author | Mark Brown <broonie@linaro.org> | 2013-10-11 20:10:13 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-10-11 20:10:13 +0100 |
| commit | 2cc6e2e0c8157b9e6ed8dbe5c7284865f6afbd46 (patch) | |
| tree | f50c505d9811d6fa2d9c042f2fdfa7ebcf79e158 /include/linux/spi | |
| parent | b158935f70b9c156903338053216dd0adf7ce31c (diff) | |
| parent | ebd805cc14bec607e74795b7933570f240508cb4 (diff) | |
| download | blackbird-op-linux-2cc6e2e0c8157b9e6ed8dbe5c7284865f6afbd46.tar.gz blackbird-op-linux-2cc6e2e0c8157b9e6ed8dbe5c7284865f6afbd46.zip | |
Merge remote-tracking branch 'spi/topic/s3c64xx' into spi-loop
Diffstat (limited to 'include/linux/spi')
| -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 da371ab5ebeb..1619ed48e75d 100644 --- a/include/linux/spi/spi.h +++ b/include/linux/spi/spi.h @@ -462,6 +462,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); |
