From 5877005e3c6c85aad7f51d2c6542d3120765eda3 Mon Sep 17 00:00:00 2001 From: Lennert Buytenhek Date: Wed, 22 Mar 2006 20:14:11 +0000 Subject: [PATCH] --- yaml --- r: 22854 b: refs/heads/master c: 709eb502ebcfcca8a3a36bab3bca3bd78caa53b1 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/asm-arm/arch-ixp2000/ixdp2x00.h | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 32071e159451..c4acfaced37c 100644 --- 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 index 229381c64283..546e2e8e27b8 100644 --- 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(); } /*