---

yaml --- r: 12092 b: refs/heads/master c: 69a8576 h: refs/heads/master v: v3
git-mirror · Nov 1, 2005 · 374b149 · 374b149
1 parent 6ccbfb5
commit 374b149
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 8 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a6f1063b388cfd48a598cc7971eae1f83ebc8ba4
+refs/heads/master: 69a857610ad212ce4bcd8e6b13f25408691403de
diff --git a/trunk/include/asm-arm/arch-ixp2000/system.h b/trunk/include/asm-arm/arch-ixp2000/system.h
@@ -44,11 +44,5 @@ static inline void arch_reset(char mode)
 		*IXDP2X01_CPLD_RESET_REG = 0x80000000;
 	}
 
-	/*
-	 * We do a reset all if we are PCI master. We could be a slave and we
-	 * don't want to do anything funky on the PCI bus.
-	 */
-	if (*IXP2000_STRAP_OPTIONS & CFG_PCI_BOOT_HOST) {
-		*(IXP2000_RESET0) |= (RSTALL);
-	}
+	*IXP2000_RESET0 = RSTALL;
 }