X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=include%2Fasm-arm%2Farch-ixp2000%2Fixdp2x00.h;fp=include%2Fasm-arm%2Farch-ixp2000%2Fixdp2x00.h;h=229381c64283ae7c0605d0138c03dc12ee1789e8;hb=64ba3f394c830ec48a1c31b53dcae312c56f1604;hp=546e2e8e27b890b17f8a27e7519c8ff3c47f2e68;hpb=be1e6109ac94a859551f8e1774eb9a8469fe055c;p=linux-2.6.git

diff --git a/include/asm-arm/arch-ixp2000/ixdp2x00.h b/include/asm-arm/arch-ixp2000/ixdp2x00.h
index 546e2e8e2..229381c64 100644
--- 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()));
 }
 
 /*