diff options
| author | Olof Johansson <olof@lixom.net> | 2014-09-24 14:20:48 -0400 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2014-09-24 14:21:01 -0400 |
| commit | 28fd837204236cf5b5533525e5b53c5176fa97a3 (patch) | |
| tree | ac7dcad925950bc0bb53c5a55cb199e31e7aaee0 /drivers/spi/spi.c | |
| parent | c82eb464879dd0ecbe0c4cb1b80ac4e82b634872 (diff) | |
| parent | 64d14a31d5410ea34641c41795e0ba222bda740c (diff) | |
Merge tag 'imx-cleanup-3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into next/cleanup
Merge "ARM: imx: cleanup for 3.18" from Shawn Guo:
The i.MX cleanup for 3.18:
- Reomve a few i.MX27 and i.MX1 board files
- Remove imx_scu_standby_enable() since core code handles scu
standby now
- Remove unnecessary iomux declaration
- Remove useless sound card property from vf610-twr dts
* tag 'imx-cleanup-3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
ARM: imx: Remove mach-mxt_td60 board file
ARM: i.MX: Remove i.MX1 ADS board support
ARM: dts: vf610-twr: remove useless property for sound card.
ARM: imx: remove imx_scu_standby_enable()
ARM: i.MX: Remove Phytec i.MX27 PCM038/PCM970 board files
ARM: i.MX: Remove mach-cpuimx27sd board file
ARM: imx: iomux: Do not export symbol without public declaration
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'drivers/spi/spi.c')
| -rw-r--r-- | drivers/spi/spi.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c index e0531baf2782..ca935df80c88 100644 --- a/drivers/spi/spi.c +++ b/drivers/spi/spi.c | |||
| @@ -848,6 +848,7 @@ out: | |||
| 848 | 848 | ||
| 849 | /** | 849 | /** |
| 850 | * spi_finalize_current_transfer - report completion of a transfer | 850 | * spi_finalize_current_transfer - report completion of a transfer |
| 851 | * @master: the master reporting completion | ||
| 851 | * | 852 | * |
| 852 | * Called by SPI drivers using the core transfer_one_message() | 853 | * Called by SPI drivers using the core transfer_one_message() |
| 853 | * implementation to notify it that the current interrupt driven | 854 | * implementation to notify it that the current interrupt driven |