[Armadeus-commitlog] armadeus branch, master, updated. release-3.4-30-gffaec3b

[Fabien M <fa...@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  ffaec3b5562ffa7fba9863033ba1a75c0f726c2a (commit)
       via  736d15b1e0163c50c87935ee336dd0a272a404c9 (commit)
      from  f7676a67496e2b2f5a071518913ad5c8f502e938 (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 ffaec3b5562ffa7fba9863033ba1a75c0f726c2a
Merge: 736d15b1e0163c50c87935ee336dd0a272a404c9 f7676a67496e2b2f5a071518913ad5c8f502e938
Author: Fabien Marteau <fab...@ar...>
Date:   Fri Apr 1 11:54:17 2011 +0200

    Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus

commit 736d15b1e0163c50c87935ee336dd0a272a404c9
Author: Fabien Marteau <fab...@ar...>
Date:   Fri Apr 1 11:53:41 2011 +0200

    [u-boot] Change nand clock to 23.75Mhz

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

Summary of changes:
 .../device/armadeus/apf51/apf51-u-boot-2010.03.h   |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/buildroot/target/device/armadeus/apf51/apf51-u-boot-2010.03.h b/buildroot/target/device/armadeus/apf51/apf51-u-boot-2010.03.h
index ad62869..d18fd86 100644
--- a/buildroot/target/device/armadeus/apf51/apf51-u-boot-2010.03.h
+++ b/buildroot/target/device/armadeus/apf51/apf51-u-boot-2010.03.h
@@ -375,7 +375,7 @@
 #define CONFIG_AHB_CLK_FREQ	133	/* MHZ AHB frequency from PLL2*/
 #define CONFIG_IPG_CLK_FREQ	66	/* 66.5 MHZ IPG frequency from PLL2*/
 #define CONFIG_PERCLK_FREQ	55	/* 55.4 MHZ PERCLK frequency */
-#define CONFIG_NFC_FREQ		27	/* MHZ NFC Clock from EMI clk*/
+#define CONFIG_NFC_FREQ		23	/* MHZ NFC Clock from EMI clk*/
 #define CONFIG_USB_FREQ		54	/* external USB serial bus frequency PLL3 */
 #define CONFIG_ESDHC_FREQ 	54	/* MHz ESDHC controller frequency / PLL3 */
 #define CONFIG_UART_FREQ	66	/* 66.5 MHz UART controller frequency from PLL2*/


hooks/post-receive
-- 
armadeus