diff options
| author | Ingo Molnar <mingo@kernel.org> | 2012-03-26 11:18:44 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2012-03-26 11:19:03 -0400 |
| commit | 7fd52392c56361a40f0c630a82b36b95ca31eac6 (patch) | |
| tree | 14091de24c6b28ea4cae9826f98aeedb7be091f5 /arch/ia64/xen/irq_xen.c | |
| parent | b01c3a0010aabadf745f3e7fdb9cab682e0a28a2 (diff) | |
| parent | e22057c8599373e5caef0bc42bdb95d2a361ab0d (diff) | |
Merge branch 'linus' into perf/urgent
Merge reason: we need to fix a non-trivial merge conflict.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/ia64/xen/irq_xen.c')
| -rw-r--r-- | arch/ia64/xen/irq_xen.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ia64/xen/irq_xen.c b/arch/ia64/xen/irq_xen.c index b279e142c633..3bb12230721f 100644 --- a/arch/ia64/xen/irq_xen.c +++ b/arch/ia64/xen/irq_xen.c | |||
| @@ -58,7 +58,7 @@ xen_free_irq_vector(int vector) | |||
| 58 | 58 | ||
| 59 | irq_op.vector = vector; | 59 | irq_op.vector = vector; |
| 60 | if (HYPERVISOR_physdev_op(PHYSDEVOP_free_irq_vector, &irq_op)) | 60 | if (HYPERVISOR_physdev_op(PHYSDEVOP_free_irq_vector, &irq_op)) |
| 61 | printk(KERN_WARNING "%s: xen_free_irq_vecotr fail vector=%d\n", | 61 | printk(KERN_WARNING "%s: xen_free_irq_vector fail vector=%d\n", |
| 62 | __func__, vector); | 62 | __func__, vector); |
| 63 | } | 63 | } |
| 64 | 64 | ||