[Armadeus-commitlog] armadeus branch, master, updated. release-3.4-50-g03b5a8a

[jscheer <js...@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  03b5a8a29f94b1419e099e831b43f984eb693b4c (commit)
       via  ffa6397da5d100d533f39132d899a2bc3ab295a0 (commit)
      from  b47f13d5e124998907cb99d680a133c21058d99d (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 03b5a8a29f94b1419e099e831b43f984eb693b4c
Merge: ffa6397da5d100d533f39132d899a2bc3ab295a0 b47f13d5e124998907cb99d680a133c21058d99d
Author: Jeremie Scheer <jer...@ar...>
Date:   Wed Apr 13 11:57:57 2011 +0200

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

commit ffa6397da5d100d533f39132d899a2bc3ab295a0
Author: Jeremie Scheer <jer...@ar...>
Date:   Wed Apr 13 11:57:18 2011 +0200

    [LINUX] Add direction to PWM0 GPIO port in patch 426.

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

Summary of changes:
 ...rmadeus-mx2-iomux-correct_gpio_port_names.patch |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/426-armadeus-mx2-iomux-correct_gpio_port_names.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/426-armadeus-mx2-iomux-correct_gpio_port_names.patch
index 6704474..fb84a72 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/426-armadeus-mx2-iomux-correct_gpio_port_names.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/426-armadeus-mx2-iomux-correct_gpio_port_names.patch
@@ -2,16 +2,16 @@ Fix GPIO port names.
 
 Signed-off-by: Jeremie Scheer <jer...@ar...>
 
-Index: linux-2.6.38-rc3/arch/arm/plat-mxc/include/mach/iomux-mx2x.h
+Index: linux-2.6.38.1/arch/arm/plat-mxc/include/mach/iomux-mx2x.h
 ===================================================================
---- linux-2.6.38-rc3.orig/arch/arm/plat-mxc/include/mach/iomux-mx2x.h	2011-04-01 17:11:02.000000000 +0200
-+++ linux-2.6.38-rc3/arch/arm/plat-mxc/include/mach/iomux-mx2x.h	2011-04-01 17:11:49.000000000 +0200
+--- linux-2.6.38.1.orig/arch/arm/plat-mxc/include/mach/iomux-mx2x.h	2011-04-13 11:43:30.000000000 +0200
++++ linux-2.6.38.1/arch/arm/plat-mxc/include/mach/iomux-mx2x.h	2011-04-13 11:48:05.000000000 +0200
 @@ -105,7 +105,7 @@
  #define PD31_PF_CSPI1_MOSI	(GPIO_PORTD | GPIO_PF | GPIO_OUT | 31)
  #define PE3_PF_UART2_CTS	(GPIO_PORTE | GPIO_PF | GPIO_OUT | 3)
  #define PE4_PF_UART2_RTS	(GPIO_PORTE | GPIO_PF | GPIO_IN | 4)
 -#define PE5_PF_PWMO		(GPIO_PORTE | GPIO_PF | 5)
-+#define PE5_PF_PWM0		(GPIO_PORTE | GPIO_PF | 5)
++#define PE5_PF_PWM0		(GPIO_PORTE | GPIO_PF | GPIO_OUT | 5)
  #define PE6_PF_UART2_TXD	(GPIO_PORTE | GPIO_PF | GPIO_OUT | 6)
  #define PE7_PF_UART2_RXD	(GPIO_PORTE | GPIO_PF | GPIO_IN | 7)
  #define PE8_PF_UART3_TXD	(GPIO_PORTE | GPIO_PF | GPIO_OUT | 8)


hooks/post-receive
-- 
armadeus