---

yaml --- r: 22854 b: refs/heads/master c: 709eb50 h: refs/heads/master v: v3
git-mirror · Mar 22, 2006 · 5877005 · 5877005
1 parent b392627
commit 5877005
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e99053e07514e514611167ad648c65c87982c4d9
+refs/heads/master: 709eb502ebcfcca8a3a36bab3bca3bd78caa53b1
diff --git a/trunk/include/asm-arm/arch-ixp2000/ixdp2x00.h b/trunk/include/asm-arm/arch-ixp2000/ixdp2x00.h
@@ -72,12 +72,11 @@
 
 #ifndef __ASSEMBLY__
 /*
- * Master NPU will always have flash and be PCI master.
- * Slave NPU may or may not have flash but will never be PCI master.
+ * The master NPU is always PCI master.
  */
 static inline unsigned int ixdp2x00_master_npu(void)
 {
-	return ((ixp2000_has_flash()) && (ixp2000_is_pcimaster()));
+	return !!ixp2000_is_pcimaster();
 }
 
 /*