[Armadeus-commitlog] armadeus branch, master, updated. release-3.3-330-gc63b885

[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  c63b88554c43a17c1926a70d71cad84caa04502f (commit)
       via  1d7106835164f8ec7689381b30f11906dbfcf524 (commit)
      from  508d93efeed222e611a4c7ac50d8fd00b226349a (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 c63b88554c43a17c1926a70d71cad84caa04502f
Merge: 1d7106835164f8ec7689381b30f11906dbfcf524 508d93efeed222e611a4c7ac50d8fd00b226349a
Author: Nicolas Colombain <nic...@ar...>
Date:   Fri Feb 18 11:38:50 2011 +0100

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

commit 1d7106835164f8ec7689381b30f11906dbfcf524
Author: Nicolas Colombain <nic...@ar...>
Date:   Fri Feb 18 11:37:47 2011 +0100

    [U-BOOT] APF51 fix contrast line state at startup

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

Summary of changes:
 .../target/u-boot/u-boot-2010.03-401-apf51.patch   |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/buildroot/target/u-boot/u-boot-2010.03-401-apf51.patch b/buildroot/target/u-boot/u-boot-2010.03-401-apf51.patch
index 6bb476e..774505d 100644
--- a/buildroot/target/u-boot/u-boot-2010.03-401-apf51.patch
+++ b/buildroot/target/u-boot/u-boot-2010.03-401-apf51.patch
@@ -481,7 +481,7 @@ Index: u-boot-2010.03/board/armadeus/apf51/apf51.c
 +	/*
 +	 * Configure iomux for display 1 interface
 +	 */
-+	mxc_request_iomux(MX51_PIN_DI1_D1_CS, IOMUX_CONFIG_ALT0);
++	mxc_request_iomux(MX51_PIN_DI1_D1_CS, IOMUX_CONFIG_ALT4);
 +// missing in DS	mxc_request_iomux(MX51_PIN_DI1_DISP_CLK, IOMUX_CONFIG_ALT0);
 +	mxc_request_iomux(MX51_PIN_DI1_PIN2, IOMUX_CONFIG_ALT0);
 +	mxc_request_iomux(MX51_PIN_DI1_PIN3, IOMUX_CONFIG_ALT0);


hooks/post-receive
-- 
armadeus