diff options
author | Fabio Estevam <fabio.estevam@freescale.com> | 2013-02-05 12:36:16 -0500 |
---|---|---|
committer | Shawn Guo <shawn.guo@linaro.org> | 2013-04-02 08:43:07 -0400 |
commit | 5fe839d997f955e9e62b70d798d3faaa19620383 (patch) | |
tree | 466fff5318341b5e60b0d97f030536c4227d4d37 | |
parent | 180cb7d6ab8cb2a48f11fe2bdde85aa3ab359c3a (diff) |
ARM: imx: avic: Move avic_saved_mask_reg under CONFIG_PM
When building a kernel with CONFIG_PM undefined, the following warning happens:
arch/arm/mach-imx/avic.c:57:12: warning: 'avic_saved_mask_reg' defined but not used [-Wunused-variable]
Move avic_saved_mask_reg definition inside the '#ifdef CONFIG_PM' block to
avoid the warning.
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
-rw-r--r-- | arch/arm/mach-imx/avic.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-imx/avic.c b/arch/arm/mach-imx/avic.c index 0eff23ed92b9..49c87e7aa817 100644 --- a/arch/arm/mach-imx/avic.c +++ b/arch/arm/mach-imx/avic.c | |||
@@ -54,8 +54,6 @@ | |||
54 | void __iomem *avic_base; | 54 | void __iomem *avic_base; |
55 | static struct irq_domain *domain; | 55 | static struct irq_domain *domain; |
56 | 56 | ||
57 | static u32 avic_saved_mask_reg[2]; | ||
58 | |||
59 | #ifdef CONFIG_MXC_IRQ_PRIOR | 57 | #ifdef CONFIG_MXC_IRQ_PRIOR |
60 | static int avic_irq_set_priority(unsigned char irq, unsigned char prio) | 58 | static int avic_irq_set_priority(unsigned char irq, unsigned char prio) |
61 | { | 59 | { |
@@ -113,6 +111,8 @@ static struct mxc_extra_irq avic_extra_irq = { | |||
113 | }; | 111 | }; |
114 | 112 | ||
115 | #ifdef CONFIG_PM | 113 | #ifdef CONFIG_PM |
114 | static u32 avic_saved_mask_reg[2]; | ||
115 | |||
116 | static void avic_irq_suspend(struct irq_data *d) | 116 | static void avic_irq_suspend(struct irq_data *d) |
117 | { | 117 | { |
118 | struct irq_chip_generic *gc = irq_data_get_irq_chip_data(d); | 118 | struct irq_chip_generic *gc = irq_data_get_irq_chip_data(d); |