Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
linux
Commits
27d56db8
Commit
27d56db8
authored
21 years ago
by
David S. Miller
Browse files
Options
Browse Files
Download
Plain Diff
Merge nuts.ninka.net:/disk1/davem/BK/tg3work-2.5
into nuts.ninka.net:/disk1/davem/BK/tg3-2.6
parents
e36a9e24
898e7d5a
Changes
3
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
294 additions
and
261 deletions
+294
-261
drivers/net/tg3.c
drivers/net/tg3.c
+290
-261
drivers/pci/pci.ids
drivers/pci/pci.ids
+2
-0
include/linux/pci_ids.h
include/linux/pci_ids.h
+2
-0
No files found.
drivers/net/tg3.c
View file @
27d56db8
This diff is collapsed.
Click to expand it.
drivers/pci/pci.ids
View file @
27d56db8
...
...
@@ -5312,11 +5312,13 @@
10b7 2000 3C998-T Dual Port 10/100/1000 PCI-X
10b7 3000 3C999-T Quad Port 10/100/1000 PCI-X
1166 1648 NetXtreme CIOB-E 1000Base-T
1649 NetXtreme BCM5704S Gigabit Ethernet
164d NetXtreme BCM5702FE Gigabit Ethernet
1653 NetXtreme BCM5705 Gigabit Ethernet
1654 NetXtreme BCM5705 Gigabit Ethernet
165d NetXtreme BCM5705M Gigabit Ethernet
165e NetXtreme BCM5705M Gigabit Ethernet
166e NetXtreme BCM5705F Gigabit Ethernet
1696 NetXtreme BCM5782 Gigabit Ethernet
14e4 000d NetXtreme BCM5782 1000Base-T
169c NetXtreme BCM5788 Gigabit Ethernet
...
...
This diff is collapsed.
Click to expand it.
include/linux/pci_ids.h
View file @
27d56db8
...
...
@@ -1785,11 +1785,13 @@
#define PCI_DEVICE_ID_TIGON3_5702 0x1646
#define PCI_DEVICE_ID_TIGON3_5703 0x1647
#define PCI_DEVICE_ID_TIGON3_5704 0x1648
#define PCI_DEVICE_ID_TIGON3_5704S_2 0x1649
#define PCI_DEVICE_ID_TIGON3_5702FE 0x164d
#define PCI_DEVICE_ID_TIGON3_5705 0x1653
#define PCI_DEVICE_ID_TIGON3_5705_2 0x1654
#define PCI_DEVICE_ID_TIGON3_5705M 0x165d
#define PCI_DEVICE_ID_TIGON3_5705M_2 0x165e
#define PCI_DEVICE_ID_TIGON3_5705F 0x166e
#define PCI_DEVICE_ID_TIGON3_5782 0x1696
#define PCI_DEVICE_ID_TIGON3_5788 0x169c
#define PCI_DEVICE_ID_TIGON3_5702X 0x16a6
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment