Commit 9004fda5 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 50b17cfb f357563f
...@@ -180,7 +180,7 @@ static int st_irq_syscfg_probe(struct platform_device *pdev) ...@@ -180,7 +180,7 @@ static int st_irq_syscfg_probe(struct platform_device *pdev)
return st_irq_syscfg_enable(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); struct st_irq_syscfg *ddata = dev_get_drvdata(dev);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment