diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-02-28 00:35:24 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-02-28 00:35:24 -0500 |
| commit | 6749c5507388f3fc3719f57a54b540ee83f6661a (patch) | |
| tree | c069f990f86b020a14b50759d0c75475eedde186 /drivers/net/tg3.c | |
| parent | 2cf82c0256b198ae28c465f2c4d7c12c836ea5ea (diff) | |
| parent | 56ec6462af9cba56a04439154e5768672d6f390f (diff) | |
Merge ../powerpc-merge
Diffstat (limited to 'drivers/net/tg3.c')
| -rw-r--r-- | drivers/net/tg3.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c index e7dc653d5bd6..e8e92c853e89 100644 --- a/drivers/net/tg3.c +++ b/drivers/net/tg3.c | |||
| @@ -9408,6 +9408,15 @@ static int __devinit tg3_is_sun_570X(struct tg3 *tp) | |||
| 9408 | return 0; | 9408 | return 0; |
| 9409 | if (venid == PCI_VENDOR_ID_SUN) | 9409 | if (venid == PCI_VENDOR_ID_SUN) |
| 9410 | return 1; | 9410 | return 1; |
| 9411 | |||
| 9412 | /* TG3 chips onboard the SunBlade-2500 don't have the | ||
| 9413 | * subsystem-vendor-id set to PCI_VENDOR_ID_SUN but they | ||
| 9414 | * are distinguishable from non-Sun variants by being | ||
| 9415 | * named "network" by the firmware. Non-Sun cards will | ||
| 9416 | * show up as being named "ethernet". | ||
| 9417 | */ | ||
| 9418 | if (!strcmp(pcp->prom_name, "network")) | ||
| 9419 | return 1; | ||
| 9411 | } | 9420 | } |
| 9412 | return 0; | 9421 | return 0; |
| 9413 | } | 9422 | } |