[Armadeus-commitlog] armadeus branch, master, updated. release-3.4-33-g052d469

[Julien B a. A. <ar...@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  052d46939ef1911b460646dbe391aee6efd12b57 (commit)
       via  c346c522633424d3f69cfb40c71f955798a47771 (commit)
      from  0bec233eff1b77d606cfd6650304d36b00d94726 (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 052d46939ef1911b460646dbe391aee6efd12b57
Merge: c346c522633424d3f69cfb40c71f955798a47771 0bec233eff1b77d606cfd6650304d36b00d94726
Author: Julien Boibessot <jul...@ar...>
Date:   Wed Apr 6 09:09:53 2011 +0200

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

commit c346c522633424d3f69cfb40c71f955798a47771
Author: Julien Boibessot <jul...@ar...>
Date:   Wed Apr 6 09:09:32 2011 +0200

    [LINUX] Moves APF27 support from 2.6.38-rc3 to 2.6.38.1

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

Summary of changes:
 ...6.38-rc3.config => apf27-linux-2.6.38.1.config} |    0
 .../armadeus/apf27/apf27-linux-2.6.38.config       |   13 ++++++++++---
 2 files changed, 10 insertions(+), 3 deletions(-)
 rename buildroot/target/device/armadeus/apf27/{apf27-linux-2.6.38-rc3.config => apf27-linux-2.6.38.1.config} (100%)

diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-2.6.38-rc3.config b/buildroot/target/device/armadeus/apf27/apf27-linux-2.6.38.1.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf27/apf27-linux-2.6.38-rc3.config
rename to buildroot/target/device/armadeus/apf27/apf27-linux-2.6.38.1.config
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-2.6.38.config b/buildroot/target/device/armadeus/apf27/apf27-linux-2.6.38.config
index 6586bea..23c1431 100644
--- a/buildroot/target/device/armadeus/apf27/apf27-linux-2.6.38.config
+++ b/buildroot/target/device/armadeus/apf27/apf27-linux-2.6.38.config
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux/arm 2.6.38-rc3 Kernel Configuration
-# Tue Mar 22 11:42:18 2011
+# Linux/arm 2.6.38.1 Kernel Configuration
+# Fri Apr  1 16:25:18 2011
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -20,6 +20,7 @@ CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
 CONFIG_GENERIC_HWEIGHT=y
 CONFIG_GENERIC_CALIBRATE_DELAY=y
 CONFIG_NEED_DMA_MAP_STATE=y
+CONFIG_FIQ=y
 CONFIG_VECTORS_BASE=0xffff0000
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
 CONFIG_CONSTRUCTORS=y
@@ -300,6 +301,10 @@ CONFIG_IMX_HAVE_IOMUX_V1=y
 CONFIG_ARCH_MXC_AUDMUX_V1=y
 
 #
+# System MMU
+#
+
+#
 # Processor Type
 #
 CONFIG_CPU_ARM926T=y
@@ -1592,6 +1597,7 @@ CONFIG_SOUND_OSS_CORE_PRECLAIM=y
 CONFIG_SND=m
 CONFIG_SND_TIMER=m
 CONFIG_SND_PCM=m
+CONFIG_SND_JACK=y
 # CONFIG_SND_SEQUENCER is not set
 CONFIG_SND_OSSEMUL=y
 CONFIG_SND_MIXER_OSS=m
@@ -1636,7 +1642,7 @@ CONFIG_USB_HID=y
 #
 # CONFIG_HID_3M_PCT is not set
 # CONFIG_HID_A4TECH is not set
-# CONFIG_HID_ACRUX_FF is not set
+# CONFIG_HID_ACRUX is not set
 # CONFIG_HID_APPLE is not set
 # CONFIG_HID_BELKIN is not set
 # CONFIG_HID_CANDO is not set
@@ -1909,6 +1915,7 @@ CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
 CONFIG_RTC_INTF_SYSFS=y
 CONFIG_RTC_INTF_PROC=y
 CONFIG_RTC_INTF_DEV=y
+# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
 # CONFIG_RTC_DRV_TEST is not set
 
 #


hooks/post-receive
-- 
armadeus