diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-01-06 23:31:35 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-01-06 23:32:03 +0100 |
| commit | 4ec3eb13634529c0bc7466658d84d0bbe3244aea (patch) | |
| tree | b491daac2ccfc7b8ca88e171a43f66888463568a /arch/arm/include/asm/mach | |
| parent | ARM: DMA: add support for DMA debugging (diff) | |
| parent | ARM: TWD: enable one-shot mode (diff) | |
| download | linux-4ec3eb13634529c0bc7466658d84d0bbe3244aea.tar.xz linux-4ec3eb13634529c0bc7466658d84d0bbe3244aea.zip | |
Merge branch 'smp' into misc
Conflicts:
arch/arm/kernel/entry-armv.S
arch/arm/mm/ioremap.c
Diffstat (limited to 'arch/arm/include/asm/mach')
| -rw-r--r-- | arch/arm/include/asm/mach/irq.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/include/asm/mach/irq.h b/arch/arm/include/asm/mach/irq.h index 831e81453f81..22ac140edd9e 100644 --- a/arch/arm/include/asm/mach/irq.h +++ b/arch/arm/include/asm/mach/irq.h @@ -18,7 +18,7 @@ struct seq_file; * This is internal. Do not use it. */ extern void init_FIQ(void); -extern int show_fiq_list(struct seq_file *, void *); +extern int show_fiq_list(struct seq_file *, int); #ifdef CONFIG_MULTI_IRQ_HANDLER extern void (*handle_arch_irq)(struct pt_regs *); |