From: Wolfgang Denk <wd@denx.de>
Date: Wed, 22 Jul 2009 22:59:37 +0000 (+0200)
Subject: Merge branch 'master' of git://git.denx.de/u-boot-arm
X-Git-Tag: v2009.08-rc1~34^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=84efbf4d144ff8aaed3cca036aebb1fe69eff3f4;p=platform%2Fkernel%2Fu-boot.git

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

84efbf4d144ff8aaed3cca036aebb1fe69eff3f4
diff --cc include/configs/at91cap9adk.h
index 0ef3554,219eea3..27f8fd1
--- a/include/configs/at91cap9adk.h
+++ b/include/configs/at91cap9adk.h
@@@ -130,10 -130,8 +130,11 @@@
  #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
 +
  /* Ethernet */
  #define CONFIG_MACB			1
  #define CONFIG_RMII			1