diff options
| author | David S. Miller <davem@davemloft.net> | 2011-10-24 18:18:09 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-10-24 18:18:09 -0400 |
| commit | 1805b2f04855f07afe3a71d620a68f483b0ed74f (patch) | |
| tree | b823b90f37f5404fcaef70f785c70112ca74a329 /drivers/net/ethernet/smsc/smsc911x.c | |
| parent | 78d81d15b74246c7cedf84894434890b33da3907 (diff) | |
| parent | f42af6c486aa5ca6ee62800cb45c5b252020509d (diff) | |
Merge branch 'master' of ra.kernel.org:/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'drivers/net/ethernet/smsc/smsc911x.c')
| -rw-r--r-- | drivers/net/ethernet/smsc/smsc911x.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/ethernet/smsc/smsc911x.c b/drivers/net/ethernet/smsc/smsc911x.c index a3aa4c0e87f3..d2be42aafbef 100644 --- a/drivers/net/ethernet/smsc/smsc911x.c +++ b/drivers/net/ethernet/smsc/smsc911x.c | |||
| @@ -26,6 +26,7 @@ | |||
| 26 | * LAN9215, LAN9216, LAN9217, LAN9218 | 26 | * LAN9215, LAN9216, LAN9217, LAN9218 |
| 27 | * LAN9210, LAN9211 | 27 | * LAN9210, LAN9211 |
| 28 | * LAN9220, LAN9221 | 28 | * LAN9220, LAN9221 |
| 29 | * LAN89218 | ||
| 29 | * | 30 | * |
| 30 | */ | 31 | */ |
| 31 | 32 | ||
| @@ -1987,6 +1988,7 @@ static int __devinit smsc911x_init(struct net_device *dev) | |||
| 1987 | case 0x01170000: | 1988 | case 0x01170000: |
| 1988 | case 0x01160000: | 1989 | case 0x01160000: |
| 1989 | case 0x01150000: | 1990 | case 0x01150000: |
| 1991 | case 0x218A0000: | ||
| 1990 | /* LAN911[5678] family */ | 1992 | /* LAN911[5678] family */ |
| 1991 | pdata->generation = pdata->idrev & 0x0000FFFF; | 1993 | pdata->generation = pdata->idrev & 0x0000FFFF; |
| 1992 | break; | 1994 | break; |