diff options
| author | Mark Brown <broonie@linaro.org> | 2013-10-07 12:02:26 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-10-07 12:02:26 +0100 |
| commit | dabefd56c6ee883bae0bdce4d5396c3f21286ab8 (patch) | |
| tree | 2f629a4cfa71276b4afe947232f934f9b0887e7d /Documentation | |
| parent | 3b3a80019ff194e86e740ec2f013a8915efd1ccf (diff) | |
| parent | 2fe7e4add3e53df7c1b97e32076f8390dd81c6b3 (diff) | |
Merge remote-tracking branch 'spi/topic/devm' into spi-qspi
Conflicts:
drivers/spi/spi-ti-qspi.c
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/driver-model/devres.txt | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Documentation/driver-model/devres.txt b/Documentation/driver-model/devres.txt index fcb34a5697ea..84ea8216cc7d 100644 --- a/Documentation/driver-model/devres.txt +++ b/Documentation/driver-model/devres.txt @@ -302,3 +302,6 @@ PHY SLAVE DMA ENGINE devm_acpi_dma_controller_register() + +SPI + devm_spi_register_master() |