diff options
| author | Shikha Singh <shikha.singh@st.com> | 2015-12-22 04:53:37 -0500 |
|---|---|---|
| committer | Samuel Ortiz <sameo@linux.intel.com> | 2015-12-29 19:06:12 +0100 |
| commit | 6b52d994b2763c87d67b0968fa746824f8855783 (patch) | |
| tree | e6d35bf4828f8877047bb94798512b9c04665fe1 /mm/slob.c | |
| parent | ccf614f5c0eb8ac18cc3c04e3fc9fc09d76e1052 (diff) | |
| download | linux-6b52d994b2763c87d67b0968fa746824f8855783.tar.gz linux-6b52d994b2763c87d67b0968fa746824f8855783.tar.bz2 linux-6b52d994b2763c87d67b0968fa746824f8855783.zip | |
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>
Diffstat (limited to 'mm/slob.c')
0 files changed, 0 insertions, 0 deletions