diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-02 19:02:41 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-02 19:02:41 -0400 |
| commit | 891eca1447a94b25fb59b696f839a2a6897d8f1f (patch) | |
| tree | 2ebdf249e13acb792f6d15c47ae9634221fc0c55 /include | |
| parent | 48e49ead3e92d53196a78c42cf24c0eed6ca98dd (diff) | |
| parent | ec8510f6fe57f59e42484809679af31ca7896dcf (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
* master.kernel.org:/home/rmk/linux-2.6-arm:
[ARM] 3540/1: ixp23xx: deal with gap in interrupt bitmasks
[ARM] 3539/1: ixp23xx: fix __arch_ixp23xx_is_coherent() for A1 stepping
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-arm/arch-ixp23xx/memory.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-arm/arch-ixp23xx/memory.h b/include/asm-arm/arch-ixp23xx/memory.h index 6e19f46d54d1..c85fc06a043c 100644 --- a/include/asm-arm/arch-ixp23xx/memory.h +++ b/include/asm-arm/arch-ixp23xx/memory.h | |||
| @@ -49,7 +49,7 @@ static inline int __ixp23xx_arch_is_coherent(void) | |||
| 49 | { | 49 | { |
| 50 | extern unsigned int processor_id; | 50 | extern unsigned int processor_id; |
| 51 | 51 | ||
| 52 | if (((processor_id & 15) >= 2) || machine_is_roadrunner()) | 52 | if (((processor_id & 15) >= 4) || machine_is_roadrunner()) |
| 53 | return 1; | 53 | return 1; |
| 54 | 54 | ||
| 55 | return 0; | 55 | return 0; |