spi-tegra build failures in -next

[Guenter Roeck <linux@xxxxxxxxxxxx>]

Hi Mark,

I see a number of build failures in -next:

Building alpha:allmodconfig ... failed
--------------
Error log:
<stdin>:1517:2: warning: #warning syscall clone3 not implemented [-Wcpp]
drivers/spi/spi-tegra20-slink.c:1197:12: error: 'tegra_slink_runtime_resume' defined but not used

Looking into it, the problem seems to be a bad conflict resolution between
the following two commits.

efafec27c565 ("spi: Fix tegra20 build with CONFIG_PM=n")
2bab94090b01 ("spi: tegra20-slink: Declare runtime suspend and resume functions conditionally")

Granted, Linus' solution is better than mine, but it looks like the second
__maybe_unused in commit efafec27c565 got lost in spi/for-linus due to a
later merge. Would it be possible to either fix that up or drop commit
efafec27c565 from spi/for-linus ?

Thanks,
Guenter