diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-07 19:04:01 +0300 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-07 19:04:01 +0300 |
commit | 8cde0776ec1e86c270f65bf482f96288e6bf0023 (patch) | |
tree | 6350a8d67bea7bcdcbd1705a54f1b8e409a28775 /include | |
parent | 2ed5e6d09e266bd2288d49aaaf240ed8c468c13c (diff) | |
parent | b78612b796b0d6cdfba553d456eff008278830e3 (diff) | |
download | linux-8cde0776ec1e86c270f65bf482f96288e6bf0023.tar.xz |
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/ethtool.h | 3 | ||||
-rw-r--r-- | include/linux/pci_ids.h | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/include/linux/ethtool.h b/include/linux/ethtool.h index d2c390eff1b2..93535f093216 100644 --- a/include/linux/ethtool.h +++ b/include/linux/ethtool.h @@ -453,10 +453,11 @@ struct ethtool_ops { * it was foced up into this mode or autonegotiated. */ -/* The forced speed, 10Mb, 100Mb, gigabit, 10GbE. */ +/* The forced speed, 10Mb, 100Mb, gigabit, 2.5Gb, 10GbE. */ #define SPEED_10 10 #define SPEED_100 100 #define SPEED_1000 1000 +#define SPEED_2500 2500 #define SPEED_10000 10000 /* Duplex, half or full. */ diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h index cd62a39ce068..9a96f0588393 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h @@ -1786,6 +1786,7 @@ #define PCI_DEVICE_ID_TIGON3_5704 0x1648 #define PCI_DEVICE_ID_TIGON3_5704S_2 0x1649 #define PCI_DEVICE_ID_NX2_5706 0x164a +#define PCI_DEVICE_ID_NX2_5708 0x164c #define PCI_DEVICE_ID_TIGON3_5702FE 0x164d #define PCI_DEVICE_ID_TIGON3_5705 0x1653 #define PCI_DEVICE_ID_TIGON3_5705_2 0x1654 @@ -1810,6 +1811,7 @@ #define PCI_DEVICE_ID_TIGON3_5703X 0x16a7 #define PCI_DEVICE_ID_TIGON3_5704S 0x16a8 #define PCI_DEVICE_ID_NX2_5706S 0x16aa +#define PCI_DEVICE_ID_NX2_5708S 0x16ac #define PCI_DEVICE_ID_TIGON3_5702A3 0x16c6 #define PCI_DEVICE_ID_TIGON3_5703A3 0x16c7 #define PCI_DEVICE_ID_TIGON3_5781 0x16dd |