diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-04 19:31:56 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-04 19:31:56 -0500 |
| commit | d779188d2baf436e67fe8816fca2ef53d246900f (patch) | |
| tree | 9bac75842a5611172860feec3c4019ff874a2b89 /drivers/net/gianfar_mii.h | |
| parent | f61ea1b0c825a20a1826bb43a226387091934586 (diff) | |
| parent | ac67c6247361b3b8644b34e5301a46d5069c1373 (diff) | |
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'drivers/net/gianfar_mii.h')
| -rw-r--r-- | drivers/net/gianfar_mii.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/gianfar_mii.h b/drivers/net/gianfar_mii.h index e85eb216fb5b..d527cf2f9c1d 100644 --- a/drivers/net/gianfar_mii.h +++ b/drivers/net/gianfar_mii.h | |||
| @@ -24,6 +24,7 @@ | |||
| 24 | #define MII_READ_COMMAND 0x00000001 | 24 | #define MII_READ_COMMAND 0x00000001 |
| 25 | 25 | ||
| 26 | #define GFAR_SUPPORTED (SUPPORTED_10baseT_Half \ | 26 | #define GFAR_SUPPORTED (SUPPORTED_10baseT_Half \ |
| 27 | | SUPPORTED_10baseT_Full \ | ||
| 27 | | SUPPORTED_100baseT_Half \ | 28 | | SUPPORTED_100baseT_Half \ |
| 28 | | SUPPORTED_100baseT_Full \ | 29 | | SUPPORTED_100baseT_Full \ |
| 29 | | SUPPORTED_Autoneg \ | 30 | | SUPPORTED_Autoneg \ |