Merge branch 'next' of git://git.denx.de/u-boot-avr32

[platform/kernel/u-boot.git] / include / configs / TQM850M.h

diff --git a/include/configs/TQM850M.h b/include/configs/TQM850M.h
index 777776d..6f0864f 100644 (file)
--- a/include/configs/TQM850M.h
+++ b/include/configs/TQM850M.h
@@ -192,7 +192,7 @@
 
 /* use CFI flash driver */
 #define CFG_FLASH_CFI          1       /* Flash is CFI conformant */
-#define CFG_FLASH_CFI_DRIVER   1       /* Use the common driver */
+#define CONFIG_FLASH_CFI_DRIVER        1       /* Use the common driver */
 #define CFG_FLASH_BANKS_LIST   { CFG_FLASH_BASE }
 #define CFG_FLASH_EMPTY_INFO
 #define CFG_FLASH_USE_BUFFER_WRITE     1
@@ -220,7 +220,7 @@
                                                "128k(dtb),"            \
                                                "1920k(kernel),"        \
                                                "5632(rootfs),"         \
-                                               "4m(data)"      
+                                               "4m(data)"
 
 /*-----------------------------------------------------------------------
  * Hardware Information Block