Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

torvalds · torvalds · commit 9004fda59577 · 2016-12-23T16:47:25.000-08:00
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
diff --git 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);
 

Original file line number	Diff line number	Diff line change
`@@ -180,7 +180,7 @@ static int st_irq_syscfg_probe(struct platform_device *pdev)`
`180`	`180`	`return st_irq_syscfg_enable(pdev);`
`181`	`181`	`}`
`182`	`182`
`183`		`-static int st_irq_syscfg_resume(struct device *dev)`
	`183`	`+static int __maybe_unused st_irq_syscfg_resume(struct device *dev)`
`184`	`184`	`{`
`185`	`185`	`struct st_irq_syscfg *ddata = dev_get_drvdata(dev);`
`186`	`186`