diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-12-24 01:47:25 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-12-24 01:47:25 +0100 |
| commit | 9004fda59577d439564d44d6d1db52d262fe3f99 (patch) | |
| tree | 328e5f5a60a6745fd9d8a7830f4fae4ddf4e0d37 | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff) | |
| parent | irqchip/st: Mark st_irq_syscfg_resume() __maybe_unused (diff) | |
| download | linux-9004fda59577d439564d44d6d1db52d262fe3f99.tar.xz linux-9004fda59577d439564d44d6d1db52d262fe3f99.zip | |
Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull irq fix from Ingo Molnar:
"A build warning fix with certain .config's"
* 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
irqchip/st: Mark st_irq_syscfg_resume() __maybe_unused
| -rw-r--r-- | drivers/irqchip/irq-st.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/irqchip/irq-st.c b/drivers/irqchip/irq-st.c index 9af48a85c16f..5e0e250db0be 100644 --- a/drivers/irqchip/irq-st.c +++ b/drivers/irqchip/irq-st.c @@ -180,7 +180,7 @@ static int st_irq_syscfg_probe(struct platform_device *pdev) return st_irq_syscfg_enable(pdev); } -static int st_irq_syscfg_resume(struct device *dev) +static int __maybe_unused st_irq_syscfg_resume(struct device *dev) { struct st_irq_syscfg *ddata = dev_get_drvdata(dev); |