diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-21 13:35:10 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-21 13:35:10 -0800 |
| commit | cfd74486eace27a0899b30529d01bc1a09a5b973 (patch) | |
| tree | b4bb52cf16203b78f1a102567915911f0d1c4b85 /arch/x86/xen/irq.c | |
| parent | a1d3f5b70d13b7035f925de1f2ba0003a04b9ac5 (diff) | |
| parent | 8e1b4cf2108488ccfb9a3e7ed7cd85a435e01d4b (diff) | |
Merge branch 'stable/bug-fixes-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen
* 'stable/bug-fixes-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
xen: p2m: correctly initialize partial p2m leaf
xen: fix non-ANSI function warning in irq.c
Diffstat (limited to 'arch/x86/xen/irq.c')
| -rw-r--r-- | arch/x86/xen/irq.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/xen/irq.c b/arch/x86/xen/irq.c index 9d30105a0c4a..6a6fe8939645 100644 --- a/arch/x86/xen/irq.c +++ b/arch/x86/xen/irq.c @@ -126,7 +126,7 @@ static const struct pv_irq_ops xen_irq_ops __initdata = { #endif }; -void __init xen_init_irq_ops() +void __init xen_init_irq_ops(void) { pv_irq_ops = xen_irq_ops; x86_init.irqs.intr_init = xen_init_IRQ; |