diff options
| author | John W. Linville <linville@tuxdriver.com> | 2006-03-15 17:02:08 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2006-03-15 17:02:08 -0500 |
| commit | dd288e7d75b9041f79fecae77d61cfa345da7266 (patch) | |
| tree | 85ff1d1ea0fe1d6eae0b6819422d5c6c05f862cd /drivers/net/tg3.c | |
| parent | 30dcbf29cc6d92d70fa262e79e84011fe6913bed (diff) | |
| parent | 72df16f109b73be37977a26d342e9103e8851cb6 (diff) | |
Merge branch 'upstream-fixes'
Diffstat (limited to 'drivers/net/tg3.c')
| -rw-r--r-- | drivers/net/tg3.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c index 0f3798f81883..c0878f304e54 100644 --- a/drivers/net/tg3.c +++ b/drivers/net/tg3.c | |||
| @@ -10543,8 +10543,6 @@ static char * __devinit tg3_bus_string(struct tg3 *tp, char *str) | |||
| 10543 | strcat(str, "66MHz"); | 10543 | strcat(str, "66MHz"); |
| 10544 | else if (clock_ctrl == 6) | 10544 | else if (clock_ctrl == 6) |
| 10545 | strcat(str, "100MHz"); | 10545 | strcat(str, "100MHz"); |
| 10546 | else if (clock_ctrl == 7) | ||
| 10547 | strcat(str, "133MHz"); | ||
| 10548 | } else { | 10546 | } else { |
| 10549 | strcpy(str, "PCI:"); | 10547 | strcpy(str, "PCI:"); |
| 10550 | if (tp->tg3_flags & TG3_FLAG_PCI_HIGH_SPEED) | 10548 | if (tp->tg3_flags & TG3_FLAG_PCI_HIGH_SPEED) |