diff options
| author | Linus Torvalds <torvalds@woody.osdl.org> | 2007-01-04 15:55:26 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.osdl.org> | 2007-01-04 15:55:26 -0500 |
| commit | 8be7ed14f4f45e0cd19a70120a1526e1121af4b0 (patch) | |
| tree | 6529bad824cecc06639c09b0f33ff5b377bb0c75 /drivers/net/sungem.c | |
| parent | d1398a6ff503a849f3c123bc5f0fdff383a1b6ec (diff) | |
| parent | 30c4cf577fb5b68c16e5750d6bdbd7072e42b279 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
[IPV4/IPV6]: Fix inet{,6} device initialization order.
[TCP]: Use old definition of before
[NETFILTER]: ebtables: don't compute gap before checking struct type
[NETFILTER]: nf_nat: fix MASQUERADE crash on device down
[NETFILTER]: New connection tracking is not EXPERIMENTAL anymore
[NETFILTER]: Fix routing of REJECT target generated packets in output chain
[NETFILTER]: compat offsets size change
[SUNGEM]: PHY updates & pause fixes (#2)
[X25]: proper prototype for x25_init_timers()
[AF_NETLINK]: module_put cleanup
[XFRM_USER]: avoid pointless void ** casts
[NETFILTER] xt_hashlimit.c: fix typo
[NET] drivers/net/loopback.c: convert to module_init()
[PKTGEN]: Convert to kthread API.
[NET]: ifb double-counts packets
Diffstat (limited to 'drivers/net/sungem.c')
| -rw-r--r-- | drivers/net/sungem.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/sungem.c b/drivers/net/sungem.c index 785e4a535f9e..616be8d0fa85 100644 --- a/drivers/net/sungem.c +++ b/drivers/net/sungem.c | |||
| @@ -90,7 +90,8 @@ | |||
| 90 | 90 | ||
| 91 | #define ADVERTISE_MASK (SUPPORTED_10baseT_Half | SUPPORTED_10baseT_Full | \ | 91 | #define ADVERTISE_MASK (SUPPORTED_10baseT_Half | SUPPORTED_10baseT_Full | \ |
| 92 | SUPPORTED_100baseT_Half | SUPPORTED_100baseT_Full | \ | 92 | SUPPORTED_100baseT_Half | SUPPORTED_100baseT_Full | \ |
| 93 | SUPPORTED_1000baseT_Half | SUPPORTED_1000baseT_Full) | 93 | SUPPORTED_1000baseT_Half | SUPPORTED_1000baseT_Full | \ |
| 94 | SUPPORTED_Pause | SUPPORTED_Autoneg) | ||
| 94 | 95 | ||
| 95 | #define DRV_NAME "sungem" | 96 | #define DRV_NAME "sungem" |
| 96 | #define DRV_VERSION "0.98" | 97 | #define DRV_VERSION "0.98" |