aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/pcmcia
diff options
context:
space:
mode:
authorKomuro <komurojun-mbn@nifty.com>2008-05-05 10:51:12 +0900
committerJeff Garzik <jgarzik@redhat.com>2008-05-22 14:08:56 -0400
commitbdefff1f54cb76a19700663f211350de2f65cc91 (patch)
tree2d449c1431911fd99bed2fd8ae3d0ec8e294e093 /drivers/net/pcmcia
parent43fc63dceb8ff58c5ef0a30c70abd31336b5e8b4 (diff)
downloadkernel_samsung_smdk4412-bdefff1f54cb76a19700663f211350de2f65cc91.zip
kernel_samsung_smdk4412-bdefff1f54cb76a19700663f211350de2f65cc91.tar.gz
kernel_samsung_smdk4412-bdefff1f54cb76a19700663f211350de2f65cc91.tar.bz2
fmvj18x_cs: add NextCom NC5310 rev B support
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>
Diffstat (limited to 'drivers/net/pcmcia')
-rw-r--r--drivers/net/pcmcia/fmvj18x_cs.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/pcmcia/fmvj18x_cs.c b/drivers/net/pcmcia/fmvj18x_cs.c
index 8f328a0..a550c9b 100644
--- a/drivers/net/pcmcia/fmvj18x_cs.c
+++ b/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;