Fix merge problems

[u-boot] / include / dataflash.h

diff --git a/include/dataflash.h b/include/dataflash.h
index f20c738686f387b67f7c1bebe2d3fd8dc12a6129..80f0633aa944a4096b89fe4297795baa27003451 100644 (file)
--- a/include/dataflash.h
+++ b/include/dataflash.h
@@ -137,6 +137,7 @@ struct dataflash_addr {
 /*-------------------------------------------------------------------------------------------------*/
 
 #define AT45DB161      0x2c
+#define AT45DB021      0x14
 #define AT45DB321      0x34
 #define AT45DB642      0x3c
 #define AT45DB128      0x10