From 9e8720f79f3a12a0ae89ed08634c18094830ee49 Mon Sep 17 00:00:00 2001 From: Komuro Date: Mon, 5 May 2008 10:51:12 +0900 Subject: [PATCH] --- yaml --- r: 97373 b: refs/heads/master c: bdefff1f54cb76a19700663f211350de2f65cc91 h: refs/heads/master i: 97371: aad536a0f024d4c5df2fac8487e54609ca5cac19 v: v3 --- [refs] | 2 +- trunk/drivers/net/pcmcia/fmvj18x_cs.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 25697daf0a1f..7608a1d779ef 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 43fc63dceb8ff58c5ef0a30c70abd31336b5e8b4 +refs/heads/master: bdefff1f54cb76a19700663f211350de2f65cc91 diff --git a/trunk/drivers/net/pcmcia/fmvj18x_cs.c b/trunk/drivers/net/pcmcia/fmvj18x_cs.c index 8f328a03847b..a550c9bd126f 100644 --- a/trunk/drivers/net/pcmcia/fmvj18x_cs.c +++ b/trunk/drivers/net/pcmcia/fmvj18x_cs.c @@ -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;