From: Andrew Morton Signed-off-by: Andrew Morton --- drivers/ide/legacy/ide-cs.c | 16 ---------------- sound/pcmcia/pdaudiocf/pdaudiocf.c | 3 --- 2 files changed, 19 deletions(-) diff -puN drivers/ide/legacy/ide-cs.c~git-pcmcia-fixup drivers/ide/legacy/ide-cs.c --- a/drivers/ide/legacy/ide-cs.c~git-pcmcia-fixup +++ a/drivers/ide/legacy/ide-cs.c @@ -154,23 +154,7 @@ static int idecs_register(unsigned long hw.irq = irq; hw.chipset = ide_pci; hw.dev = &handle->dev; -<<<<<<< HEAD/drivers/ide/legacy/ide-cs.c return ide_register_hw_with_fixup(&hw, NULL, ide_undecoded_slave); -======= - - if(is_mmio) - return ide_register_hw_with_fixup(&hw, NULL, idecs_mmio_fixup); - else - return ide_register_hw_with_fixup(&hw, NULL, ide_undecoded_slave); -} - -static void outb_io(unsigned char value, unsigned long port) { - outb(value, port); -} - -static void outb_mem(unsigned char value, unsigned long port) { - writeb(value, (void __iomem *) port); ->>>>>>> 52c4b42378fb464a75ccdf7f8f44260e35a7f5fc/drivers/ide/legacy/ide-cs.c } /*====================================================================== diff -puN sound/pcmcia/pdaudiocf/pdaudiocf.c~git-pcmcia-fixup sound/pcmcia/pdaudiocf/pdaudiocf.c --- a/sound/pcmcia/pdaudiocf/pdaudiocf.c~git-pcmcia-fixup +++ a/sound/pcmcia/pdaudiocf/pdaudiocf.c @@ -229,8 +229,6 @@ static int pdacf_config(struct pcmcia_de CS_CHECK(RequestIRQ, pcmcia_request_irq(link, &link->irq)); CS_CHECK(RequestConfiguration, pcmcia_request_configuration(link, &link->conf)); - kfree(parse); - if (snd_pdacf_assign_resources(pdacf, link->io.BasePort1, link->irq.AssignedIRQ) < 0) goto failed; @@ -238,7 +236,6 @@ static int pdacf_config(struct pcmcia_de return 0; cs_failed: - kfree(parse); cs_error(link, last_fn, last_ret); failed: pcmcia_disable_device(link); _