diff options
| author | David S. Miller | 2008-05-26 08:26:10 +0200 |
|---|---|---|
| committer | David S. Miller | 2008-05-26 08:26:10 +0200 |
| commit | 43154d08d6bb5c69aa0d0e3448fb348b4cd84e91 (patch) | |
| tree | 176edb26aad2d33e8be36530b66b19d0603c4b1d /drivers/net/pcmcia/fmvj18x_cs.c | |
| parent | tipc: Fix initialization sequence problems when entering network mode (diff) | |
| parent | vlan: Use bitmask of feature flags instead of seperate feature bits (diff) | |
| download | kernel-qcow2-linux-43154d08d6bb5c69aa0d0e3448fb348b4cd84e91.tar.gz kernel-qcow2-linux-43154d08d6bb5c69aa0d0e3448fb348b4cd84e91.tar.xz kernel-qcow2-linux-43154d08d6bb5c69aa0d0e3448fb348b4cd84e91.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/cpmac.c
net/mac80211/mlme.c
Diffstat (limited to 'drivers/net/pcmcia/fmvj18x_cs.c')
| -rw-r--r-- | drivers/net/pcmcia/fmvj18x_cs.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/pcmcia/fmvj18x_cs.c b/drivers/net/pcmcia/fmvj18x_cs.c index 8f328a03847b..a550c9bd126f 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; |