Merge branch 'master' of git://git.denx.de/u-boot-arm

[people/ms/u-boot.git] / include / configs / at91cap9adk.h

diff --git a/include/configs/at91cap9adk.h b/include/configs/at91cap9adk.h
index df7366120b96a14c8b5cf65285dc459116d7c6a6..27f8fd1a16fb598f2ea1f525ec7ef5d4038457dd 100644 (file)
--- a/include/configs/at91cap9adk.h
+++ b/include/configs/at91cap9adk.h
@@ -130,6 +130,7 @@
 #define CONFIG_SYS_MAX_NAND_DEVICE             1
 #define CONFIG_SYS_NAND_BASE                   0x40000000
 #define CONFIG_SYS_NAND_DBW_8                  1
+#endif
 
 #define CONFIG_SYS_64BIT_VSPRINTF              /* needed for nand_util.c */
 #endif
@@ -203,7 +204,6 @@
 #define CONFIG_SYS_LONGHELP            1
 #define CONFIG_CMDLINE_EDITING 1
 
-#define ROUND(A, B)            (((A) + (B)) & ~((B) - 1))
 /*
  * Size of malloc() pool
  */