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

drivers/irqchip/irq-st.c

+1 −1
Original line number Diff line number Diff line
@@ -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);