combiner_data in combiner_base() has the same name as the global
combiner_data array. Clean this up.
Signed-off-by: Jonathan Kliegman <kli...@chromium.org>
---
arch/arm/mach-exynos/common.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm/mach-exynos/common.c b/arch/arm/mach-exynos/common.c
index 1b28aa6..3627869 100644
--- a/arch/arm/mach-exynos/common.c
+++ b/arch/arm/mach-exynos/common.c
@@ -417,10 +417,10 @@ static unsigned int rt_max_combiner_nr;
static inline void __iomem *combiner_base(struct irq_data *data)
{
- struct combiner_chip_data *combiner_data =
+ struct combiner_chip_data *irq_combiner_data =
irq_data_get_irq_chip_data(data);
- return combiner_data->base;
+ return irq_combiner_data->base;
}
static void combiner_mask_irq(struct irq_data *data)
--
1.7.7.3
--
To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
