]> err.no Git - linux-2.6/commitdiff
fmvj18x_cs: add NextCom NC5310 rev B support
authorKomuro <komurojun-mbn@nifty.com>
Mon, 5 May 2008 01:51:12 +0000 (10:51 +0900)
committerJeff Garzik <jgarzik@redhat.com>
Thu, 22 May 2008 18:08:56 +0000 (14:08 -0400)
fmvj18x_cs: The manfid of "NextCom NC5310 rev B" is MANF_ID_FUJITSU.
            but this card is MBH10302 based card.
            use ConfigBase to detect the cardtype for this card.

Signed-off-by: Komuro <komurojun-mbn@nifty.com>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
drivers/net/pcmcia/fmvj18x_cs.c

index 8f328a03847b8340ae02d92bf2060ac5252c7ff7..a550c9bd126f595312e5649fec71af7599ae3b6f 100644 (file)
@@ -391,7 +391,9 @@ static int fmvj18x_config(struct pcmcia_device *link)
            cardtype = CONTEC;
            break;
        case MANFID_FUJITSU:
-           if (link->card_id == PRODID_FUJITSU_MBH10302)
+           if (link->conf.ConfigBase == 0x0fe0)
+               cardtype = MBH10302;
+           else if (link->card_id == PRODID_FUJITSU_MBH10302) 
                 /* RATOC REX-5588/9822/4886's PRODID are 0004(=MBH10302),
                    but these are MBH10304 based card. */ 
                cardtype = MBH10304;