diff --git a/[refs] b/[refs] index d392b6492f2e..c4c6ef3a5517 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1d945e2b3e421f2ce01b2eb260392f888406933f +refs/heads/master: 7735cefc4583175486685fced2f457fbe0fd5855 diff --git a/trunk/arch/blackfin/mach-bf548/head.S b/trunk/arch/blackfin/mach-bf548/head.S index e53d74d4c0a2..4c7d49f41187 100644 --- a/trunk/arch/blackfin/mach-bf548/head.S +++ b/trunk/arch/blackfin/mach-bf548/head.S @@ -379,6 +379,7 @@ ENTRY(_bfin_reset) CLI R6; SSYNC; +#if 0 /* Need to determine later if this is here necessary for BF54x */ #if defined(CONFIG_MTD_M25P80) /* * The following code fix the SPI flash reboot issue, @@ -413,6 +414,7 @@ _delay_lab0_end: nop; _delay_lab1_end: nop; +#endif #endif /* Clear the bits 13-15 in SWRST if they werent cleared */