[Armadeus-commitlog] armadeus branch, master, updated. release-3.4-170-g7aa47bb

[jorasse <jo...@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  7aa47bbb81ee77c992a8b55b33299fcbb9543689 (commit)
       via  4f9c796d7804a710b16085649a485aae533f0fd5 (commit)
      from  a22696d160f45e01d8e9789674ede2a59dec561b (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 7aa47bbb81ee77c992a8b55b33299fcbb9543689
Merge: 4f9c796d7804a710b16085649a485aae533f0fd5 a22696d160f45e01d8e9789674ede2a59dec561b
Author: jorasse <jo...@ar...>
Date:   Fri Jun 10 14:41:57 2011 +0200

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

commit 4f9c796d7804a710b16085649a485aae533f0fd5
Author: jorasse <jo...@ar...>
Date:   Fri Jun 10 14:41:25 2011 +0200

    [LINUX] apf51: Makes APF51 compile again due to recent changes in MXC EHCI patch

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

Summary of changes:
 ...xc-ehci-factor_out_soc_specific_functions.patch |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/434-pengutronix-mxc-ehci-factor_out_soc_specific_functions.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/434-pengutronix-mxc-ehci-factor_out_soc_specific_functions.patch
index abea113..cd04879 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/434-pengutronix-mxc-ehci-factor_out_soc_specific_functions.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/434-pengutronix-mxc-ehci-factor_out_soc_specific_functions.patch
@@ -402,8 +402,8 @@ index 0d43be9..dc27288 100644
  #
  
  # Object file lists.
--obj-y   := cpu.o mm.o clock-mx51-mx53.o devices.o
-+obj-y   := cpu.o mm.o clock-mx51-mx53.o devices.o ehci.o
+-obj-y   := cpu.o mm.o clock-mx51-mx53.o devices.o system.o
++obj-y   := cpu.o mm.o clock-mx51-mx53.o devices.o system.o ehci.o
  obj-$(CONFIG_SOC_IMX50) += mm-mx50.o
  
  obj-$(CONFIG_CPU_FREQ_IMX)    += cpu_op-mx51.o


hooks/post-receive
-- 
armadeus