NFC: st95hf: Fix build error
authorShikha Singh <shikha.singh@st.com>
Tue, 22 Dec 2015 09:53:37 +0000 (04:53 -0500)
committerSamuel Ortiz <sameo@linux.intel.com>
Tue, 29 Dec 2015 18:06:12 +0000 (19:06 +0100)
commit6b52d994b2763c87d67b0968fa746824f8855783
treee6d35bf4828f8877047bb94798512b9c04665fe1
parentccf614f5c0eb8ac18cc3c04e3fc9fc09d76e1052
NFC: st95hf: Fix build error

This fixes a build error on the mn10300 architecture:

drivers/nfc/st95hf/core.c:765:20: error: conflicting types for 'irq_handler'
   static irqreturn_t irq_handler(int irq, void  *st95hfcontext)
                       ^
   In file included from arch/mn10300/include/asm/reset-regs.h:16:0,
                    from arch/mn10300/include/asm/irq.h:18,
                    from include/linux/irq.h:26,
                    from arch/mn10300/include/asm/hardirq.h:16,
                    from include/linux/hardirq.h:8,
                    from include/linux/interrupt.h:12,
                    from drivers/nfc/st95hf/core.c:23:
   arch/mn10300/include/asm/exceptions.h:107:24: note: previous declaration of 'irq_handler' was here
    extern asmlinkage void irq_handler(void);

Signed-off-by: Shikha Singh <shikha.singh@st.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
drivers/nfc/st95hf/core.c