diff options
| author | Tony Lindgren <tony@atomide.com> | 2010-08-02 11:23:38 (GMT) |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2010-08-02 11:23:38 (GMT) |
| commit | 055a1b8c9927bc587f293020a54c6cd8e24dfac0 (patch) | |
| tree | db7c8d00931180c4896c9e00d2cb506939592cda /arch/mips/bcm63xx/dev-enet.c | |
| parent | 8a6f7e14fc3b3ea911838c3f4ce137cb8a3d134a (diff) | |
| parent | f535daed925c2d3c1db06b06a63c4955f2c51988 (diff) | |
| download | linux-fsl-qoriq-055a1b8c9927bc587f293020a54c6cd8e24dfac0.tar.xz | |
Merge branch 'devel-misc' into omap-for-linus
Diffstat (limited to 'arch/mips/bcm63xx/dev-enet.c')
| -rw-r--r-- | arch/mips/bcm63xx/dev-enet.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/mips/bcm63xx/dev-enet.c b/arch/mips/bcm63xx/dev-enet.c index 9f544ba..39c2336 100644 --- 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; |