From 374b1490ca04fa2392c77610a2110b743c1b3583 Mon Sep 17 00:00:00 2001 From: Lennert Buytenhek Date: Tue, 1 Nov 2005 19:44:25 +0000 Subject: [PATCH] --- yaml --- r: 12092 b: refs/heads/master c: 69a857610ad212ce4bcd8e6b13f25408691403de h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/asm-arm/arch-ixp2000/system.h | 8 +------- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index ad8b4b1ce6e0..6530d07d7807 100644 --- 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 index 4f489cc0dfa5..d9d6d9d07e02 100644 --- 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; }