Merge git://git.denx.de/u-boot-fsl-qoriq

[u-boot] / common / flash.c

diff --git a/common/flash.c b/common/flash.c
index fa33f03d2ed3e285267c2fd1b3f8448b7db59ab6..587ef601585ced8c63e1cc29680cb5021c59c813 100644 (file)
--- a/common/flash.c
+++ b/common/flash.c
@@ -10,7 +10,6 @@
 #include <common.h>
 #include <flash.h>
 
-#if !defined(CONFIG_SYS_NO_FLASH)
 #include <mtd/cfi_flash.h>
 
 extern flash_info_t  flash_info[]; /* info for FLASH chips */
@@ -218,7 +217,3 @@ void flash_perror (int err)
                break;
        }
 }
-
-/*-----------------------------------------------------------------------
- */
-#endif /* !CONFIG_SYS_NO_FLASH */