diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-09-12 07:02:26 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-09-12 07:02:26 -0400 |
| commit | ddd559b13f6d2fe3ad68c4b3f5235fd3c2eae4e3 (patch) | |
| tree | d827bca3fc825a0ac33efbcd493713be40fcc812 /arch/arm/mach-orion5x/addr-map.c | |
| parent | cf7a2b4fb6a9b86779930a0a123b0df41aa9208f (diff) | |
| parent | f17a1f06d2fa93f4825be572622eb02c4894db4e (diff) | |
Merge branch 'devel-stable' into devel
Conflicts:
MAINTAINERS
arch/arm/mm/fault.c
Diffstat (limited to 'arch/arm/mach-orion5x/addr-map.c')
| -rw-r--r-- | arch/arm/mach-orion5x/addr-map.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-orion5x/addr-map.c b/arch/arm/mach-orion5x/addr-map.c index d78731edebb6..1a5d6a0e2602 100644 --- a/arch/arm/mach-orion5x/addr-map.c +++ b/arch/arm/mach-orion5x/addr-map.c | |||
| @@ -84,7 +84,8 @@ static int __init orion5x_cpu_win_can_remap(int win) | |||
| 84 | orion5x_pcie_id(&dev, &rev); | 84 | orion5x_pcie_id(&dev, &rev); |
| 85 | if ((dev == MV88F5281_DEV_ID && win < 4) | 85 | if ((dev == MV88F5281_DEV_ID && win < 4) |
| 86 | || (dev == MV88F5182_DEV_ID && win < 2) | 86 | || (dev == MV88F5182_DEV_ID && win < 2) |
| 87 | || (dev == MV88F5181_DEV_ID && win < 2)) | 87 | || (dev == MV88F5181_DEV_ID && win < 2) |
| 88 | || (dev == MV88F6183_DEV_ID && win < 4)) | ||
| 88 | return 1; | 89 | return 1; |
| 89 | 90 | ||
| 90 | return 0; | 91 | return 0; |