summaryrefslogtreecommitdiffstats
path: root/drivers/irqchip/irq-xilinx-intc.c
diff options
context:
space:
mode:
authorZubair Lutfullah Kakakhel <Zubair.Kakakhel@imgtec.com>2016-11-14 13:13:48 +0100
committerMarc Zyngier <marc.zyngier@arm.com>2016-11-29 10:14:49 +0100
commit2120a43527f3bd0efba0e893799acdd1486c2d1b (patch)
tree7de845cc58bb20e8e91b61d6c9f660c2bdc90c95 /drivers/irqchip/irq-xilinx-intc.c
parentirqchip/xilinx: Restructure and use jump label api (diff)
downloadlinux-2120a43527f3bd0efba0e893799acdd1486c2d1b.tar.xz
linux-2120a43527f3bd0efba0e893799acdd1486c2d1b.zip
irqchip/xilinx: Rename get_irq to xintc_get_irq
Now that the driver is generic and used by multiple archs, get_irq is too generic. Rename get_irq to xintc_get_irq to avoid any conflicts Acked-by: Michal Simek <michal.simek@xilinx.com> Signed-off-by: Zubair Lutfullah Kakakhel <Zubair.Kakakhel@imgtec.com> Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Diffstat (limited to 'drivers/irqchip/irq-xilinx-intc.c')
-rw-r--r--drivers/irqchip/irq-xilinx-intc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/irqchip/irq-xilinx-intc.c b/drivers/irqchip/irq-xilinx-intc.c
index 7331d8cb35f1..34ec609ea898 100644
--- a/drivers/irqchip/irq-xilinx-intc.c
+++ b/drivers/irqchip/irq-xilinx-intc.c
@@ -101,7 +101,7 @@ static struct irq_chip intc_dev = {
.irq_mask_ack = intc_mask_ack,
};
-unsigned int get_irq(void)
+unsigned int xintc_get_irq(void)
{
unsigned int hwirq, irq = -1;