diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-07-31 20:37:25 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-07-31 20:37:25 -0400 |
| commit | 57cad8084e0837e0f2c97da789ec9b3f36809be9 (patch) | |
| tree | e9c790afb4286f78cb08d9664f58baa7e876fe55 /drivers/char/hvsi.c | |
| parent | cb18bd40030c879cd93fef02fd579f74dbab473d (diff) | |
| parent | 49b1e3ea19b1c95c2f012b8331ffb3b169e4c042 (diff) | |
Merge branch 'merge'
Diffstat (limited to 'drivers/char/hvsi.c')
| -rw-r--r-- | drivers/char/hvsi.c | 2 |
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) | |||
| 1298 | hp->inbuf_end = hp->inbuf; | 1298 | hp->inbuf_end = hp->inbuf; |
| 1299 | hp->state = HVSI_CLOSED; | 1299 | hp->state = HVSI_CLOSED; |
| 1300 | hp->vtermno = *vtermno; | 1300 | hp->vtermno = *vtermno; |
| 1301 | hp->virq = irq_create_mapping(NULL, irq[0], 0); | 1301 | hp->virq = irq_create_mapping(NULL, irq[0]); |
| 1302 | if (hp->virq == NO_IRQ) { | 1302 | if (hp->virq == NO_IRQ) { |
| 1303 | printk(KERN_ERR "%s: couldn't create irq mapping for 0x%x\n", | 1303 | printk(KERN_ERR "%s: couldn't create irq mapping for 0x%x\n", |
| 1304 | __FUNCTION__, irq[0]); | 1304 | __FUNCTION__, irq[0]); |