Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
linux-davinci-2.6.23
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
linux
linux-davinci-2.6.23
Commits
d297c31f
Commit
d297c31f
authored
Mar 29, 2007
by
David S. Miller
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[TULIP]: Use pci_device_to_OF_node() on sparc.
Signed-off-by:
David S. Miller
<
davem@davemloft.net
>
parent
49345103
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
11 deletions
+7
-11
drivers/net/tulip/tulip_core.c
drivers/net/tulip/tulip_core.c
+7
-11
No files found.
drivers/net/tulip/tulip_core.c
View file @
d297c31f
...
...
@@ -37,7 +37,7 @@
#include <asm/uaccess.h>
#ifdef CONFIG_SPARC
#include <asm/p
b
m.h>
#include <asm/p
ro
m.h>
#endif
static
char
version
[]
__devinitdata
=
...
...
@@ -1536,22 +1536,18 @@ static int __devinit tulip_init_one (struct pci_dev *pdev,
that here as well. */
if
(
sum
==
0
||
sum
==
6
*
0xff
)
{
#if defined(CONFIG_SPARC)
struct
pcidev_cookie
*
pcp
=
pdev
->
sysdata
;
struct
device_node
*
dp
=
pci_device_to_OF_node
(
pdev
);
const
unsigned
char
*
addr
;
int
len
;
#endif
eeprom_missing
=
1
;
for
(
i
=
0
;
i
<
5
;
i
++
)
dev
->
dev_addr
[
i
]
=
last_phys_addr
[
i
];
dev
->
dev_addr
[
i
]
=
last_phys_addr
[
i
]
+
1
;
#if defined(CONFIG_SPARC)
if
(
pcp
)
{
const
unsigned
char
*
addr
;
int
len
;
addr
=
of_get_property
(
pcp
->
prom_node
,
"local-mac-address"
,
&
len
);
if
(
addr
&&
len
==
6
)
memcpy
(
dev
->
dev_addr
,
addr
,
6
);
}
addr
=
of_get_property
(
dp
,
"local-mac-address"
,
&
len
);
if
(
addr
&&
len
==
6
)
memcpy
(
dev
->
dev_addr
,
addr
,
6
);
#endif
#if defined(__i386__) || defined(__x86_64__)
/* Patch up x86 BIOS bug. */
if
(
last_irq
)
...
...
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