linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / include / asm-arm / arch-ixp2000 / ixdp2x00.h

diff --git a/include/asm-arm/arch-ixp2000/ixdp2x00.h b/include/asm-arm/arch-ixp2000/ixdp2x00.h
index 546e2e8..229381c 100644 (file)
--- a/include/asm-arm/arch-ixp2000/ixdp2x00.h
+++ b/include/asm-arm/arch-ixp2000/ixdp2x00.h
@@ -72,11 +72,12 @@
 
 #ifndef __ASSEMBLY__
 /*
- * The master NPU is always PCI master.
+ * Master NPU will always have flash and be PCI master.
+ * Slave NPU may or may not have flash but will never be PCI master.
  */
 static inline unsigned int ixdp2x00_master_npu(void)
 {
-       return !!ixp2000_is_pcimaster();
+       return ((ixp2000_has_flash()) && (ixp2000_is_pcimaster()));
 }
 
 /*