From: Andrew Morton Signed-off-by: Andrew Morton --- drivers/serial/serial_cs.c | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff -puN drivers/serial/serial_cs.c~git-serial-fixup drivers/serial/serial_cs.c --- a/drivers/serial/serial_cs.c~git-serial-fixup +++ a/drivers/serial/serial_cs.c @@ -747,12 +747,9 @@ static int serial_config(struct pcmcia_d info->multi = (first_tuple(link, tuple, parse) == CS_SUCCESS); /* Is this a multiport card? */ -<<<<<<< HEAD/drivers/serial/serial_cs.c tuple->DesiredTuple = CISTPL_MANFID; + info->prodid = parse->manfid.card; if (first_tuple(link, tuple, parse) == CS_SUCCESS) { - info->manfid = parse->manfid.manf; - info->prodid = parse->manfid.card; - for (i = 0; i < ARRAY_SIZE(quirks); i++) if ((quirks[i].manfid == ~0 || quirks[i].manfid == info->manfid) && @@ -762,17 +759,6 @@ static int serial_config(struct pcmcia_d break; } } -======= - info->manfid = link->manf_id; - info->prodid = link->card_id; - for (i = 0; i < MULTI_COUNT; i++) - if ((info->manfid == multi_id[i].manfid) && - (info->prodid == multi_id[i].prodid)) - break; - if (i < MULTI_COUNT) - info->multi = multi_id[i].multi; ->>>>>>> /drivers/serial/serial_cs.c - /* Another check for dual-serial cards: look for either serial or multifunction cards that ask for appropriate IO port ranges */ if ((info->multi == 0) && @@ -815,7 +801,6 @@ static int serial_config(struct pcmcia_d kfree(cfg_mem); return 0; - cs_failed: cs_error(link, last_fn, last_ret); failed: serial_remove(link); _