projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
f2a6827
)
MIPS: BCM63xx: Prevent second enet registration on BCM6338
author
Florian Fainelli
<
[email protected]
>
Wed, 21 Jul 2010 20:59:26 +0000
(22:59 +0200)
committer
Ralf Baechle
<
[email protected]
>
Mon, 26 Jul 2010 18:08:18 +0000
(19:08 +0100)
This SoC has only one ethernet MAC, so prevent registration of a second one.
Signed-off-by: Florian Fainelli <
[email protected]
>
To:
[email protected]
Patchwork: https://patchwork.linux-mips.org/patch/1482/
Signed-off-by: Ralf Baechle <
[email protected]
>
arch/mips/bcm63xx/dev-enet.c
patch
|
blob
|
history
diff --git
a/arch/mips/bcm63xx/dev-enet.c
b/arch/mips/bcm63xx/dev-enet.c
index 9f544badd0b4d5dddc25701a690bb63b797cf8f8..39c23366c5c7ea4bcbe6c272fe0279aca4d82aba 100644
(file)
--- a/
arch/mips/bcm63xx/dev-enet.c
+++ b/
arch/mips/bcm63xx/dev-enet.c
@@
-104,6
+104,9
@@
int __init bcm63xx_enet_register(int unit,
if (unit > 1)
return -ENODEV;
+ if (unit == 1 && BCMCPU_IS_6338())
+ return -ENODEV;
+
if (!shared_device_registered) {
shared_res[0].start = bcm63xx_regset_address(RSET_ENETDMA);
shared_res[0].end = shared_res[0].start;