summaryrefslogtreecommitdiff
path: root/arch/arm/mach-imx/avic.c
diff options
context:
space:
mode:
authorShawn Guo <shawn.guo@linaro.org>2013-04-09 22:52:11 +0800
committerShawn Guo <shawn.guo@linaro.org>2013-04-09 22:52:11 +0800
commit30dd1877aa2282b6ea3910490782e5fd03d817e2 (patch)
tree80f9cbbb14700048359bceef15a07bbb8a6b1663 /arch/arm/mach-imx/avic.c
parent07961ac7c0ee8b546658717034fe692fd12eefa9 (diff)
parent3442a7b51d1cfae144f3289ab0be44e27c236f53 (diff)
Merge tag 'imx-cleanup-3.10' into imx/dt
The imx cleanup for 3.10: * Clean up a couple of unneeded function declarations * Remove imx specific cpufreq driver as generic cpufreq-cpu0 works well as the replacement * Remove platform ahci support * Clean up unused ARCH/MACH Kconfig symbols * Remove a couple of unused files
Diffstat (limited to 'arch/arm/mach-imx/avic.c')
-rw-r--r--arch/arm/mach-imx/avic.c4
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 @@
void __iomem *avic_base;
static struct irq_domain *domain;
-static u32 avic_saved_mask_reg[2];
-
#ifdef CONFIG_MXC_IRQ_PRIOR
static int avic_irq_set_priority(unsigned char irq, unsigned char prio)
{
@@ -113,6 +111,8 @@ static struct mxc_extra_irq avic_extra_irq = {
};
#ifdef CONFIG_PM
+static u32 avic_saved_mask_reg[2];
+
static void avic_irq_suspend(struct irq_data *d)
{
struct irq_chip_generic *gc = irq_data_get_irq_chip_data(d);