diff --git a/[refs] b/[refs] index 8d8e7981a80c..b3e8c71dfe2e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f2a68272d799bf4092443357142f63b74f7669a1 +refs/heads/master: 7f13f65e61f1deed77c5c335ed0fa4d08f69e608 diff --git a/trunk/arch/mips/bcm63xx/dev-enet.c b/trunk/arch/mips/bcm63xx/dev-enet.c index 9f544badd0b4..39c23366c5c7 100644 --- a/trunk/arch/mips/bcm63xx/dev-enet.c +++ b/trunk/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;