diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-22 22:22:33 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-22 22:22:33 -0400 |
| commit | f09cc910fe3af7e63298105bc0482653eb534c3c (patch) | |
| tree | a09dca8a3d033352edff6cb1d911f3cd0e980f1f /include/linux/pci_ids.h | |
| parent | 8b0eaccab4584ace24d233214bfee3cb50e49a60 (diff) | |
| parent | ea2c47b42f12dadbad9d879fb6df102b9003ab82 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: (30 commits)
[IPSEC] IPV6: Fix to add tunnel mode SA correctly.
[NET]: Cut off the queue_mapping field from sk_buff
[NET]: Hide the queue_mapping field inside netif_subqueue_stopped
[NET]: Make and use skb_get_queue_mapping
[NET]: Use the skb_set_queue_mapping where appropriate
[INET]: Use MODULE_ALIAS_NET_PF_PROTO_TYPE where possible.
[INET]: Let inet_diag and friends autoload
[NIU]: Cleanup PAGE_SIZE checks a bit
[NET]: Fix SKB_WITH_OVERHEAD calculation
[ATM]: Fix clip module reload crash.
[TG3]: Update version to 3.85
[TG3]: PCI command adjustment
[TG3]: Add management FW version to ethtool report
[TG3]: Add 5723 support
[Bluetooth] Convert RFCOMM to use kthread API
[Bluetooth] Add constant for Bluetooth socket options level
[Bluetooth] Add support for handling simple eSCO links
[Bluetooth] Add address and channel attribute to RFCOMM TTY device
[Bluetooth] Fix wrong argument in debug code of HIDP
[Bluetooth] Add generic driver for Bluetooth USB devices
...
Diffstat (limited to 'include/linux/pci_ids.h')
| -rw-r--r-- | include/linux/pci_ids.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h index df948b44edad..4e10a074ca56 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h | |||
| @@ -1943,6 +1943,7 @@ | |||
| 1943 | #define PCI_DEVICE_ID_TIGON3_5720 0x1658 | 1943 | #define PCI_DEVICE_ID_TIGON3_5720 0x1658 |
| 1944 | #define PCI_DEVICE_ID_TIGON3_5721 0x1659 | 1944 | #define PCI_DEVICE_ID_TIGON3_5721 0x1659 |
| 1945 | #define PCI_DEVICE_ID_TIGON3_5722 0x165a | 1945 | #define PCI_DEVICE_ID_TIGON3_5722 0x165a |
| 1946 | #define PCI_DEVICE_ID_TIGON3_5723 0x165b | ||
| 1946 | #define PCI_DEVICE_ID_TIGON3_5705M 0x165d | 1947 | #define PCI_DEVICE_ID_TIGON3_5705M 0x165d |
| 1947 | #define PCI_DEVICE_ID_TIGON3_5705M_2 0x165e | 1948 | #define PCI_DEVICE_ID_TIGON3_5705M_2 0x165e |
| 1948 | #define PCI_DEVICE_ID_TIGON3_5714 0x1668 | 1949 | #define PCI_DEVICE_ID_TIGON3_5714 0x1668 |