diff options
| author | Eric Anholt <eric@anholt.net> | 2010-08-01 22:23:53 -0400 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2010-08-01 22:34:47 -0400 |
| commit | 2bd34f6ca86b5a5f9b749624f73310820e7a93fd (patch) | |
| tree | 9e42100423e78f400412dfa974a6a13bac94d2c0 /arch/mips/bcm63xx/dev-enet.c | |
| parent | a2757b6fab6dee3dbf43bdb7d7226d03747fbdb1 (diff) | |
| parent | 9fe6206f400646a2322096b56c59891d530e8d51 (diff) | |
Merge remote branch 'origin/master' into drm-intel-next
This resolves the conflict in the EDP code, which has been rather
popular to hack on recently.
Conflicts:
drivers/gpu/drm/i915/intel_dp.c
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 9f544badd0b4..39c23366c5c7 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, | |||
| 104 | if (unit > 1) | 104 | if (unit > 1) |
| 105 | return -ENODEV; | 105 | return -ENODEV; |
| 106 | 106 | ||
| 107 | if (unit == 1 && BCMCPU_IS_6338()) | ||
| 108 | return -ENODEV; | ||
| 109 | |||
| 107 | if (!shared_device_registered) { | 110 | if (!shared_device_registered) { |
| 108 | shared_res[0].start = bcm63xx_regset_address(RSET_ENETDMA); | 111 | shared_res[0].start = bcm63xx_regset_address(RSET_ENETDMA); |
| 109 | shared_res[0].end = shared_res[0].start; | 112 | shared_res[0].end = shared_res[0].start; |