summaryrefslogtreecommitdiffstats
path: root/drivers/char/hvsi.c
diff options
context:
space:
mode:
authorPaul Mackerras2006-08-01 02:37:25 +0200
committerPaul Mackerras2006-08-01 02:37:25 +0200
commit57cad8084e0837e0f2c97da789ec9b3f36809be9 (patch)
treee9c790afb4286f78cb08d9664f58baa7e876fe55 /drivers/char/hvsi.c
parent[POWERPC] Instrument Hypervisor Calls: merge headers (diff)
parentMerge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/... (diff)
downloadkernel-qcow2-linux-57cad8084e0837e0f2c97da789ec9b3f36809be9.tar.gz
kernel-qcow2-linux-57cad8084e0837e0f2c97da789ec9b3f36809be9.tar.xz
kernel-qcow2-linux-57cad8084e0837e0f2c97da789ec9b3f36809be9.zip
Merge branch 'merge'
Diffstat (limited to 'drivers/char/hvsi.c')
-rw-r--r--drivers/char/hvsi.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/hvsi.c b/drivers/char/hvsi.c
index 542de0e51f35..9101784ecf02 100644
--- a/drivers/char/hvsi.c
+++ b/drivers/char/hvsi.c
@@ -1298,7 +1298,7 @@ static int __init hvsi_console_init(void)
hp->inbuf_end = hp->inbuf;
hp->state = HVSI_CLOSED;
hp->vtermno = *vtermno;
- hp->virq = irq_create_mapping(NULL, irq[0], 0);
+ hp->virq = irq_create_mapping(NULL, irq[0]);
if (hp->virq == NO_IRQ) {
printk(KERN_ERR "%s: couldn't create irq mapping for 0x%x\n",
__FUNCTION__, irq[0]);