summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-06-02 16:02:41 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-06-02 16:02:41 -0700
commit891eca1447a94b25fb59b696f839a2a6897d8f1f (patch)
tree2ebdf249e13acb792f6d15c47ae9634221fc0c55 /include
parent48e49ead3e92d53196a78c42cf24c0eed6ca98dd (diff)
parentec8510f6fe57f59e42484809679af31ca7896dcf (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.h2
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)
{
extern unsigned int processor_id;
- if (((processor_id & 15) >= 2) || machine_is_roadrunner())
+ if (((processor_id & 15) >= 4) || machine_is_roadrunner())
return 1;
return 0;