Merge branch 'master' of /usr/src/ntfs-2.6/

[firefly-linux-kernel-4.4.55.git] / include / asm-arm / arch-ixp2000 / system.h

diff --git a/include/asm-arm/arch-ixp2000/system.h b/include/asm-arm/arch-ixp2000/system.h
index ddbbb34b5f95e80757c42359bc13a3ac363062db..3cc9a04f68cb316d27880cc0cf2e8029b5399a93 100644 (file)
--- a/include/asm-arm/arch-ixp2000/system.h
+++ b/include/asm-arm/arch-ixp2000/system.h
@@ -37,7 +37,7 @@ static inline void arch_reset(char mode)
         * to cause a complete reset of the CPU and all external devices
         * and move the flash bank register back to 0.
         */
-       if (machine_is_ixdp2801()) {
+       if (machine_is_ixdp2801() || machine_is_ixdp28x5()) {
                unsigned long reset_reg = *IXDP2X01_CPLD_RESET_REG;
 
                reset_reg = 0x55AA0000 | (reset_reg & 0x0000FFFF);