[Armadeus-commitlog] armadeus branch, master, updated. release-3.3-33-g258d639

[Nicolas <th...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".

The branch, master has been updated
       via  258d639395ec119f7a5f08c38dea96118815fe04 (commit)
      from  1afa0ec9c6d46c31919283037f3d70c9d2224edd (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 258d639395ec119f7a5f08c38dea96118815fe04
Author: Nicolas Colombain <nic...@ar...>
Date:   Wed Sep 29 18:59:38 2010 +0200

    [U-BOOT] fix error in tftp.c when compiling APF9328. bug#85

-----------------------------------------------------------------------

Summary of changes:
 ...u-boot-1.3.4-340-nand_large_file_download.patch |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/buildroot/target/u-boot/u-boot-1.3.4-340-nand_large_file_download.patch b/buildroot/target/u-boot/u-boot-1.3.4-340-nand_large_file_download.patch
index a26b094..a809979 100644
--- a/buildroot/target/u-boot/u-boot-1.3.4-340-nand_large_file_download.patch
+++ b/buildroot/target/u-boot/u-boot-1.3.4-340-nand_large_file_download.patch
@@ -74,7 +74,7 @@
  #endif	/* CONFIG_MCAST_TFTP */
  
 +
-+
++#if defined(CONFIG_CMD_NAND)
 +int tftp_nand_write(nand_info_t *meminfo, uchar *src, unsigned long *offset   )
 +{
 +	size_t written;
@@ -161,7 +161,7 @@
 +		}
 +	}
 +}
-+
++#endif
 +
  static __inline__ void
  store_block (unsigned block, uchar * src, unsigned len)


hooks/post-receive
-- 
armadeus