diff options
| author | James Morris <jmorris@namei.org> | 2011-04-19 07:32:41 -0400 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2011-04-19 07:32:41 -0400 |
| commit | d4ab4e6a23f805abb8fc3cc34525eec3788aeca1 (patch) | |
| tree | eefd82c155bc27469a85667d759cd90facf4a6e3 /drivers/net/tulip/eeprom.c | |
| parent | c0fa797ae6cd02ff87c0bfe0d509368a3b45640e (diff) | |
| parent | 96fd2d57b8252e16dfacf8941f7a74a6119197f5 (diff) | |
Merge branch 'master'; commit 'v2.6.39-rc3' into next
Diffstat (limited to 'drivers/net/tulip/eeprom.c')
| -rw-r--r-- | drivers/net/tulip/eeprom.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/tulip/eeprom.c b/drivers/net/tulip/eeprom.c index 3031ed9c4a1a..296486bf0956 100644 --- a/drivers/net/tulip/eeprom.c +++ b/drivers/net/tulip/eeprom.c | |||
| @@ -115,7 +115,7 @@ static void __devinit tulip_build_fake_mediatable(struct tulip_private *tp) | |||
| 115 | 0x02, /* phy reset sequence length */ | 115 | 0x02, /* phy reset sequence length */ |
| 116 | 0x01, 0x00, /* phy reset sequence */ | 116 | 0x01, 0x00, /* phy reset sequence */ |
| 117 | 0x00, 0x78, /* media capabilities */ | 117 | 0x00, 0x78, /* media capabilities */ |
| 118 | 0x00, 0xe0, /* nway advertisment */ | 118 | 0x00, 0xe0, /* nway advertisement */ |
| 119 | 0x00, 0x05, /* fdx bit map */ | 119 | 0x00, 0x05, /* fdx bit map */ |
| 120 | 0x00, 0x06 /* ttm bit map */ | 120 | 0x00, 0x06 /* ttm bit map */ |
| 121 | }; | 121 | }; |