diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2011-04-26 04:22:15 -0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2011-04-26 04:22:59 -0400 |
| commit | 07f9479a40cc778bc1462ada11f95b01360ae4ff (patch) | |
| tree | 0676cf38df3844004bb3ebfd99dfa67a4a8998f5 /drivers/net/tulip/eeprom.c | |
| parent | 9d5e6bdb3013acfb311ab407eeca0b6a6a3dedbf (diff) | |
| parent | cd2e49e90f1cae7726c9a2c54488d881d7f1cd1c (diff) | |
Merge branch 'master' into for-next
Fast-forwarded to current state of Linus' tree as there are patches to be
applied for files that didn't exist on the old branch.
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 | }; |