diff options
| author | Greg Ungerer <gerg@uclinux.org> | 2014-11-10 11:41:18 +1000 |
|---|---|---|
| committer | Greg Ungerer <gerg@uclinux.org> | 2015-02-03 14:16:23 +1000 |
| commit | 7372eefc15f0f6d6d97c4afbf8be3ba12105a633 (patch) | |
| tree | 20524f619d606fbea9c656e33644498446cb2018 /arch/m68k/include | |
| parent | ef0012b48cb7410014b733de939470d80d827dfe (diff) | |
| download | blackbird-op-linux-7372eefc15f0f6d6d97c4afbf8be3ba12105a633.tar.gz blackbird-op-linux-7372eefc15f0f6d6d97c4afbf8be3ba12105a633.zip | |
m68knommu: fix irq handler types in 68360/commproc.c
Compilation of arch/m68k/68360/commproc.c fails with the following errors:
arch/m68k/68360/commproc.c:75:1: error: function declaration isn’t a prototype
arch/m68k/68360/commproc.c:211:1: error: function declaration isn’t a prototype
arch/m68k/68360/commproc.c: In function ‘cpm_install_handler’:
arch/m68k/68360/commproc.c:214:2: warning: passing argument 2 of ‘request_irq’ from incompatible pointer type
include/linux/interrupt.h:128:1: note: expected ‘irq_handler_t’ but argument is of type ‘void (*)()’
It should be using the proper irq hander type, irq_handler_t. Modify it
to use that.
Signed-off-by: Greg Ungerer <gerg@uclinux.org>
Diffstat (limited to 'arch/m68k/include')
| -rw-r--r-- | arch/m68k/include/asm/commproc.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/m68k/include/asm/commproc.h b/arch/m68k/include/asm/commproc.h index c67e09279ea9..f41c96863e98 100644 --- a/arch/m68k/include/asm/commproc.h +++ b/arch/m68k/include/asm/commproc.h @@ -649,7 +649,7 @@ typedef struct scc_trans { /* #define CPMVEC_PIO_PC4 ((ushort)0x01) */ /* #define CPMVEC_ERROR ((ushort)0x00) */ -extern void cpm_install_handler(int vec, void (*handler)(void *), void *dev_id); +extern void cpm_install_handler(int vec, irq_handler_t handler, void *dev_id); /* CPM interrupt configuration vector. */ |
