diff options
author | Paul Mackerras <paulus@samba.org> | 2006-03-17 02:01:19 +0100 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2006-03-17 02:01:19 +0100 |
commit | 23dd64011285010ac291f7dddf6e287bdb43a0ad (patch) | |
tree | 0e4f4569d38d82f4dceb4150d5ad940e0fd5f24f /drivers/net/tg3.c | |
parent | Merge ../linux-2.6 (diff) | |
parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-merge (diff) | |
download | linux-23dd64011285010ac291f7dddf6e287bdb43a0ad.tar.xz linux-23dd64011285010ac291f7dddf6e287bdb43a0ad.zip |
Merge ../linux-2.6
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 15545620ab0e..b8f1524da557 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) strcat(str, "66MHz"); else if (clock_ctrl == 6) strcat(str, "100MHz"); - else if (clock_ctrl == 7) - strcat(str, "133MHz"); } else { strcpy(str, "PCI:"); if (tp->tg3_flags & TG3_FLAG_PCI_HIGH_SPEED) |