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
Kirill Smelkov
linux
Commits
18239d8f
Commit
18239d8f
authored
Apr 03, 2002
by
Arjan van de Ven
Committed by
Jeff Garzik
Apr 03, 2002
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Merge some new PCI ids from e100 to eepro100 net driver.
parent
3db906fb
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
12 additions
and
2 deletions
+12
-2
drivers/net/eepro100.c
drivers/net/eepro100.c
+12
-2
No files found.
drivers/net/eepro100.c
View file @
18239d8f
...
@@ -826,8 +826,9 @@ static int speedo_found1(struct pci_dev *pdev,
...
@@ -826,8 +826,9 @@ static int speedo_found1(struct pci_dev *pdev,
sp
->
phy
[
0
]
=
eeprom
[
6
];
sp
->
phy
[
0
]
=
eeprom
[
6
];
sp
->
phy
[
1
]
=
eeprom
[
7
];
sp
->
phy
[
1
]
=
eeprom
[
7
];
sp
->
rx_bug
=
(
eeprom
[
3
]
&
0x03
)
==
3
?
0
:
1
;
sp
->
rx_bug
=
(
eeprom
[
3
]
&
0x03
)
==
3
?
0
:
1
;
if
(((
pdev
->
device
>
0x1030
&&
(
pdev
->
device
<
0x1039
)))
if
(((
pdev
->
device
>
0x1030
&&
(
pdev
->
device
<
0x103F
)))
||
(
pdev
->
device
==
0x2449
))
{
||
(
pdev
->
device
==
0x2449
)
||
(
pdev
->
device
==
0x2459
)
||
(
pdev
->
device
==
0x245D
))
{
sp
->
chip_id
=
1
;
sp
->
chip_id
=
1
;
}
}
...
@@ -2285,8 +2286,17 @@ static struct pci_device_id eepro100_pci_tbl[] __devinitdata = {
...
@@ -2285,8 +2286,17 @@ static struct pci_device_id eepro100_pci_tbl[] __devinitdata = {
{
PCI_VENDOR_ID_INTEL
,
0x1036
,
PCI_ANY_ID
,
PCI_ANY_ID
,
},
{
PCI_VENDOR_ID_INTEL
,
0x1036
,
PCI_ANY_ID
,
PCI_ANY_ID
,
},
{
PCI_VENDOR_ID_INTEL
,
0x1037
,
PCI_ANY_ID
,
PCI_ANY_ID
,
},
{
PCI_VENDOR_ID_INTEL
,
0x1037
,
PCI_ANY_ID
,
PCI_ANY_ID
,
},
{
PCI_VENDOR_ID_INTEL
,
0x1038
,
PCI_ANY_ID
,
PCI_ANY_ID
,
},
{
PCI_VENDOR_ID_INTEL
,
0x1038
,
PCI_ANY_ID
,
PCI_ANY_ID
,
},
{
PCI_VENDOR_ID_INTEL
,
0x1039
,
PCI_ANY_ID
,
PCI_ANY_ID
,
},
{
PCI_VENDOR_ID_INTEL
,
0x103A
,
PCI_ANY_ID
,
PCI_ANY_ID
,
},
{
PCI_VENDOR_ID_INTEL
,
0x103B
,
PCI_ANY_ID
,
PCI_ANY_ID
,
},
{
PCI_VENDOR_ID_INTEL
,
0x103C
,
PCI_ANY_ID
,
PCI_ANY_ID
,
},
{
PCI_VENDOR_ID_INTEL
,
0x103D
,
PCI_ANY_ID
,
PCI_ANY_ID
,
},
{
PCI_VENDOR_ID_INTEL
,
0x103E
,
PCI_ANY_ID
,
PCI_ANY_ID
,
},
{
PCI_VENDOR_ID_INTEL
,
0x1227
,
PCI_ANY_ID
,
PCI_ANY_ID
,
},
{
PCI_VENDOR_ID_INTEL
,
0x1227
,
PCI_ANY_ID
,
PCI_ANY_ID
,
},
{
PCI_VENDOR_ID_INTEL
,
0x1228
,
PCI_ANY_ID
,
PCI_ANY_ID
,
},
{
PCI_VENDOR_ID_INTEL
,
0x1228
,
PCI_ANY_ID
,
PCI_ANY_ID
,
},
{
PCI_VENDOR_ID_INTEL
,
0x2449
,
PCI_ANY_ID
,
PCI_ANY_ID
,
},
{
PCI_VENDOR_ID_INTEL
,
0x2459
,
PCI_ANY_ID
,
PCI_ANY_ID
,
},
{
PCI_VENDOR_ID_INTEL
,
0x245D
,
PCI_ANY_ID
,
PCI_ANY_ID
,
},
{
PCI_VENDOR_ID_INTEL
,
0x5200
,
PCI_ANY_ID
,
PCI_ANY_ID
,
},
{
PCI_VENDOR_ID_INTEL
,
0x5200
,
PCI_ANY_ID
,
PCI_ANY_ID
,
},
{
PCI_VENDOR_ID_INTEL
,
0x5201
,
PCI_ANY_ID
,
PCI_ANY_ID
,
},
{
PCI_VENDOR_ID_INTEL
,
0x5201
,
PCI_ANY_ID
,
PCI_ANY_ID
,
},
{
0
,}
{
0
,}
...
...
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