From: Allen Martin Date: Fri, 19 Nov 2010 22:50:50 +0000 (-0800) Subject: ARM: tegra: irq: protect irq suspend with CONFIG_PM X-Git-Tag: firefly_0821_release~9833^2~100^2~1 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=287241377fa85a0ae29efa02c94851ab2ae50127;p=firefly-linux-kernel-4.4.55.git ARM: tegra: irq: protect irq suspend with CONFIG_PM Protect irq suspend/resume functions behind #ifdef CONFIG_PM. This prevents a link error if CONFIG_PM is turned off. Signed-off-by: Allen Martin Signed-off-by: Colin Cross --- diff --git a/arch/arm/mach-tegra/irq.c b/arch/arm/mach-tegra/irq.c index 458f9c8e85cb..47b7064ae061 100644 --- a/arch/arm/mach-tegra/irq.c +++ b/arch/arm/mach-tegra/irq.c @@ -146,6 +146,7 @@ void tegra_set_lp0_wake_pads(u32 wake_enb, u32 wake_level, u32 wake_any) writel(wake_enb, pmc + PMC_WAKE_MASK); } +#ifdef CONFIG_PM static void tegra_irq_handle_wake(void) { int wake; @@ -174,6 +175,7 @@ static void tegra_irq_handle_wake(void) generic_handle_irq(irq); } } +#endif static void tegra_mask(unsigned int irq) { @@ -251,6 +253,7 @@ void __init tegra_init_irq(void) } } +#ifdef CONFIG_PM void tegra_irq_suspend(void) { tegra_legacy_irq_suspend(); @@ -261,6 +264,7 @@ void tegra_irq_resume(void) tegra_legacy_irq_resume(); tegra_irq_handle_wake(); } +#endif #ifdef CONFIG_DEBUG_FS static int tegra_wake_irq_debug_show(struct seq_file *s, void *data)