From e8935eefe56070a37ece62e2d7f8e45c6c9356da Mon Sep 17 00:00:00 2001 From: Gerd Hoffmann Date: Fri, 14 Aug 2009 11:36:16 +0200 Subject: Move isa_connect_irq calls into isa_create_simple Now with isa-bus maintaining the isa irqs we can move the isa_connect_irq() calls into isa_create_simple(). Signed-off-by: Gerd Hoffmann Signed-off-by: Anthony Liguori --- hw/pc.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'hw/pc.c') diff --git a/hw/pc.c b/hw/pc.c index 915e691916..9dad10491c 100644 --- a/hw/pc.c +++ b/hw/pc.c @@ -1376,9 +1376,7 @@ static void pc_init1(ram_addr_t ram_size, } } - isa_dev = isa_create_simple("i8042", 0x60, 0x64); - isa_connect_irq(isa_dev, 0, 1); - isa_connect_irq(isa_dev, 1, 12); + isa_dev = isa_create_simple("i8042", 0x60, 0x64, 1, 12); DMA_init(0); #ifdef HAS_AUDIO audio_init(pci_enabled ? pci_bus : NULL, isa_irq); -- cgit 1.4.1