diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-04-08 15:13:46 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-04-08 15:13:46 +1000 |
| commit | ebdaee088bb9a3aa25787c4be80c1b47dd6a6ca1 (patch) | |
| tree | 6a6e45c9dd1c1868931cc459cb216d7d42dec3f1 | |
| parent | 6905f58bd59c8f8a532c14bbf31f559194ca9826 (diff) | |
| parent | 361ae8cb57ec35ace2fa5f9695dba14eca9893e0 (diff) | |
Merge remote-tracking branch 'xen-two/linux-next'
| -rw-r--r-- | drivers/xen/events.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/xen/events.c b/drivers/xen/events.c index 42d6c930cc87..33167b43ac7e 100644 --- a/drivers/xen/events.c +++ b/drivers/xen/events.c @@ -912,8 +912,7 @@ int bind_evtchn_to_irqhandler(unsigned int evtchn, unsigned long irqflags, const char *devname, void *dev_id) { - unsigned int irq; - int retval; + int irq, retval; irq = bind_evtchn_to_irq(evtchn); if (irq < 0) @@ -955,8 +954,7 @@ int bind_virq_to_irqhandler(unsigned int virq, unsigned int cpu, irq_handler_t handler, unsigned long irqflags, const char *devname, void *dev_id) { - unsigned int irq; - int retval; + int irq, retval; irq = bind_virq_to_irq(virq, cpu); if (irq < 0) |