diff options
| author | David S. Miller <davem@davemloft.net> | 2018-01-19 10:30:40 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-01-19 10:30:57 -0500 |
| commit | aa73dc95b2de107b88df5871c7f483446507330f (patch) | |
| tree | accbc7b5a269e97846f60b0bf852243d2433fc8a | |
| parent | 8b7d82878841cedefa6d52f52bb15a1b5947d441 (diff) | |
| parent | 58359193193c4261d340b2f7f028e5096d4e4d15 (diff) | |
| download | op-kernel-dev-aa73dc95b2de107b88df5871c7f483446507330f.zip op-kernel-dev-aa73dc95b2de107b88df5871c7f483446507330f.tar.gz | |
Merge tag 'linux-can-next-for-4.16-20180119' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can-next
Marc Kleine-Budde says:
====================
pull-request: can-next 2018-01-16
this is a pull request for net-next/master consisting of 1 patch.
This patch by Arnd Bergmann for the m_can driver silences a compiler
warning if CONFIG_PM is not selected.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/can/m_can/m_can.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/can/m_can/m_can.c b/drivers/net/can/m_can/m_can.c index 49ed873..2594f77 100644 --- a/drivers/net/can/m_can/m_can.c +++ b/drivers/net/can/m_can/m_can.c @@ -1749,7 +1749,7 @@ static int m_can_plat_remove(struct platform_device *pdev) return 0; } -static int m_can_runtime_suspend(struct device *dev) +static int __maybe_unused m_can_runtime_suspend(struct device *dev) { struct net_device *ndev = dev_get_drvdata(dev); struct m_can_priv *priv = netdev_priv(ndev); @@ -1760,7 +1760,7 @@ static int m_can_runtime_suspend(struct device *dev) return 0; } -static int m_can_runtime_resume(struct device *dev) +static int __maybe_unused m_can_runtime_resume(struct device *dev) { struct net_device *ndev = dev_get_drvdata(dev); struct m_can_priv *priv = netdev_priv(ndev); |
