at91: taurus: Enable DM_SPI

[u-boot] / common / flash.c

diff --git a/common/flash.c b/common/flash.c
index 6d492c729f050a0dcd2a1f91d2513411c5c28247..876677493f51f0e5d821193c17dacb5eedb98166 100644 (file)
--- a/common/flash.c
+++ b/common/flash.c
@@ -10,7 +10,6 @@
 #include <common.h>
 #include <flash.h>
 
-#if defined(CONFIG_MTD_NOR_FLASH)
 #include <mtd/cfi_flash.h>
 
 extern flash_info_t  flash_info[]; /* info for FLASH chips */
@@ -113,7 +112,7 @@ addr2info (ulong addr)
  * and no protected sectors are hit.
  * Returns:
  * ERR_OK          0 - OK
- * ERR_TIMOUT      1 - write timeout
+ * ERR_TIMEOUT     1 - write timeout
  * ERR_NOT_ERASED  2 - Flash not erased
  * ERR_PROTECTED   4 - target range includes protected sectors
  * ERR_INVAL       8 - target address not in Flash memory
@@ -186,7 +185,7 @@ void flash_perror (int err)
        switch (err) {
        case ERR_OK:
                break;
-       case ERR_TIMOUT:
+       case ERR_TIMEOUT:
                puts ("Timeout writing to Flash\n");
                break;
        case ERR_NOT_ERASED:
@@ -218,7 +217,3 @@ void flash_perror (int err)
                break;
        }
 }
-
-/*-----------------------------------------------------------------------
- */
-#endif /* !CONFIG_MTD_NOR_FLASH */