Merge branch 'merge'

This commit is contained in:
Paul Mackerras
2006-08-01 10:37:25 +10:00
1510 changed files with 22961 additions and 13521 deletions

View File

@@ -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]);