Merge remote branch 'wireless-next/master' into ath6kl-next

[~andy/linux] / arch / arm / mach-omap1 / fpga.c

diff --git a/arch/arm/mach-omap1/fpga.c b/arch/arm/mach-omap1/fpga.c
index 76c67b3f9f61b9c4f00ffe12a5045195b58776a2..29ec50fc688dcedc44af04b40d8dd998c8d8e088 100644 (file)
--- a/arch/arm/mach-omap1/fpga.c
+++ b/arch/arm/mach-omap1/fpga.c
@@ -87,7 +87,7 @@ static void fpga_mask_ack_irq(struct irq_data *d)
        fpga_ack_irq(d);
 }
 
-void innovator_fpga_IRQ_demux(unsigned int irq, struct irq_desc *desc)
+static void innovator_fpga_IRQ_demux(unsigned int irq, struct irq_desc *desc)
 {
        u32 stat;
        int fpga_irq;