diff options
| author | Mark Brown <broonie@linaro.org> | 2013-10-11 15:10:13 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-10-11 15:10:13 -0400 |
| commit | 2cc6e2e0c8157b9e6ed8dbe5c7284865f6afbd46 (patch) | |
| tree | f50c505d9811d6fa2d9c042f2fdfa7ebcf79e158 /include/linux/spi/spi.h | |
| parent | b158935f70b9c156903338053216dd0adf7ce31c (diff) | |
| parent | ebd805cc14bec607e74795b7933570f240508cb4 (diff) | |
Merge remote-tracking branch 'spi/topic/s3c64xx' into spi-loop
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 da371ab5ebeb..1619ed48e75d 100644 --- a/include/linux/spi/spi.h +++ b/include/linux/spi/spi.h | |||
| @@ -462,6 +462,8 @@ extern struct spi_master * | |||
| 462 | spi_alloc_master(struct device *host, unsigned size); | 462 | spi_alloc_master(struct device *host, unsigned size); |
| 463 | 463 | ||
| 464 | extern int spi_register_master(struct spi_master *master); | 464 | extern int spi_register_master(struct spi_master *master); |
| 465 | extern int devm_spi_register_master(struct device *dev, | ||
| 466 | struct spi_master *master); | ||
| 465 | extern void spi_unregister_master(struct spi_master *master); | 467 | extern void spi_unregister_master(struct spi_master *master); |
| 466 | 468 | ||
| 467 | extern struct spi_master *spi_busnum_to_master(u16 busnum); | 469 | extern struct spi_master *spi_busnum_to_master(u16 busnum); |